From f0e451a2d3d2899a7a0566391d7fafe5578f5692 Mon Sep 17 00:00:00 2001 From: Corey Hulen Date: Tue, 4 Apr 2017 08:24:58 -0700 Subject: Fixing config file watch and config reload on license save (#5954) * Fixing config file watch and config reload on license save * Fixing config file watch and config reload on license save * Fixing build error * Fixing locking issue --- app/admin.go | 2 ++ 1 file changed, 2 insertions(+) (limited to 'app/admin.go') 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 { -- cgit v1.2.3-1-g7c22