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

@@ -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 {

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
 }