summaryrefslogtreecommitdiffstats
path: root/app/admin.go
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2017-04-17 07:55:03 -0700
committerChristopher Speller <crspeller@gmail.com>2017-04-17 10:55:03 -0400
commitacc991dea1f97e5eb93cbb1c861925d24114caca (patch)
treef7abbf45448da746dc298790e3068c616f52ccfb /app/admin.go
parent32078865147dc4779023e036aba164842067e58b (diff)
downloadchat-acc991dea1f97e5eb93cbb1c861925d24114caca.tar.gz
chat-acc991dea1f97e5eb93cbb1c861925d24114caca.tar.bz2
chat-acc991dea1f97e5eb93cbb1c861925d24114caca.zip
PLT-6317 disable file watcher while running from makefile (#6103)
* PLT-6317 disable file watcher while running from make file * Removing debug stmt
Diffstat (limited to 'app/admin.go')
-rw-r--r--app/admin.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/admin.go b/app/admin.go
index 3ff10015c..103c4617b 100644
--- a/app/admin.go
+++ b/app/admin.go
@@ -136,7 +136,6 @@ func SaveConfig(cfg *model.Config) *model.AppError {
return model.NewLocAppError("saveConfig", "ent.cluster.save_config.error", nil, "")
}
- //oldCfg := utils.Cfg
utils.DisableConfigWatch()
utils.SaveConfig(utils.CfgFileName, cfg)
utils.LoadConfig(utils.CfgFileName)
@@ -150,6 +149,7 @@ func SaveConfig(cfg *model.Config) *model.AppError {
}
}
+ // oldCfg := utils.Cfg
// Future feature is to sync the configuration files
// if einterfaces.GetClusterInterface() != nil {
// err := einterfaces.GetClusterInterface().ConfigChanged(cfg, oldCfg, true)