plugins: Move plugins cache path initialization to initPluginsOrError.

Fixes #4951.
This commit is contained in:
negative0 2021-01-25 23:11:52 +05:30 committed by Nick Craig-Wood
parent f5af761466
commit 6272ca74bc

View File

@ -68,13 +68,6 @@ var (
initMutex = &sync.Mutex{} initMutex = &sync.Mutex{}
) )
func init() {
cachePath = filepath.Join(config.CacheDir, "webgui")
PluginsPath = filepath.Join(cachePath, "plugins")
pluginsConfigPath = filepath.Join(PluginsPath, "config")
}
// Plugins represents the structure how plugins are saved onto disk // Plugins represents the structure how plugins are saved onto disk
type Plugins struct { type Plugins struct {
mutex sync.Mutex mutex sync.Mutex
@ -96,6 +89,9 @@ func initPluginsOrError() error {
initMutex.Lock() initMutex.Lock()
defer initMutex.Unlock() defer initMutex.Unlock()
if !initSuccess { if !initSuccess {
cachePath = filepath.Join(config.CacheDir, "webgui")
PluginsPath = filepath.Join(cachePath, "plugins")
pluginsConfigPath = filepath.Join(PluginsPath, "config")
loadedPlugins = newPlugins(availablePluginsJSONPath) loadedPlugins = newPlugins(availablePluginsJSONPath)
err := loadedPlugins.readFromFile() err := loadedPlugins.readFromFile()
if err != nil { if err != nil {