Fix config upgrade process requiring double restart

pydio · Oct 29, 2018 · 29b9e7f · 29b9e7f
1 parent 224f9c5
commit 29b9e7f
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/common/config/vars.go b/common/config/vars.go
@@ -85,8 +85,17 @@ func Default() *Config {
 			config.WithSource(newLocalSource()),
 		)}
 		if save, e := UpgradeConfigsIfRequired(defaultConfig); e == nil && save {
-			saveConfig(defaultConfig, common.PYDIO_SYSTEM_USERNAME, "Configs upgrades applied")
-			fmt.Println("[Configs] successfully saved config after upgrade")
+			e2 := saveConfig(defaultConfig, common.PYDIO_SYSTEM_USERNAME, "Configs upgrades applied")
+			if e2 != nil {
+				fmt.Println("[Configs] Error while saving upgraded configs")
+			} else {
+				fmt.Println("[Configs] successfully saved config after upgrade - Reloading from source")
+			}
+			// RELOAD FULLY FROM SOURCE, TO MAKE SURE IT IS IN SYNC WITH JSON
+			defaultConfig = &Config{config.NewConfig(
+				// config.WithSource(newEnvSource()),
+				config.WithSource(newLocalSource()),
+			)}
 		} else if e != nil {
 			fmt.Errorf("[Configs] something whent wrong while upgrading configs: %s", e.Error())
 		}