summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/admin.go2
-rw-r--r--app/license.go3
2 files changed, 5 insertions, 0 deletions
diff --git a/app/admin.go b/app/admin.go
index 509d81840..b86eb5993 100644
--- a/app/admin.go
+++ b/app/admin.go
@@ -137,8 +137,10 @@ func SaveConfig(cfg *model.Config) *model.AppError {
}
//oldCfg := utils.Cfg
+ utils.DisableConfigWatch()
utils.SaveConfig(utils.CfgFileName, cfg)
utils.LoadConfig(utils.CfgFileName)
+ utils.EnableConfigWatch()
if einterfaces.GetMetricsInterface() != nil {
if *utils.Cfg.MetricsSettings.Enable {
diff --git a/app/license.go b/app/license.go
index 6b448b19d..c41c17fd8 100644
--- a/app/license.go
+++ b/app/license.go
@@ -100,6 +100,9 @@ func SaveLicense(licenseBytes []byte) (*model.License, *model.AppError) {
return nil, model.NewLocAppError("addLicense", model.INVALID_LICENSE_ERROR, nil, "")
}
+ ReloadConfig()
+ InvalidateAllCaches()
+
return license, nil
}