1 files changed, 11 insertions, 4 deletions
diff --git a/utils/config.go b/utils/config.go
index 14f151d2d..a4ec82078 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -36,6 +36,7 @@ var Cfg *model.Config = &model.Config{}
 var CfgDiagnosticId = ""
 var CfgHash = ""
 var CfgFileName string = ""
+var CfgDisableConfigWatch = false
 var ClientCfg map[string]string = map[string]string{}
 var originalDisableDebugLvl l4g.Level = l4g.DEBUG
 var siteURL = ""
@@ -178,6 +179,10 @@ func InitializeConfigWatch() {
 	cfgMutex.Lock()
 	defer cfgMutex.Unlock()
 
+	if CfgDisableConfigWatch {
+		return
+	}
+
 	if watcher == nil {
 		var err error
 		watcher, err = fsnotify.NewWatcher()
@@ -215,11 +220,13 @@ func EnableConfigWatch() {
 	cfgMutex.Lock()
 	defer cfgMutex.Unlock()
 
-	configFile := filepath.Clean(CfgFileName)
-	configDir, _ := filepath.Split(configFile)
-
 	if watcher != nil {
-		watcher.Add(configDir)
+		configFile := filepath.Clean(CfgFileName)
+		configDir, _ := filepath.Split(configFile)
+
+		if watcher != nil {
+			watcher.Add(configDir)
+		}
 	}
 }