From acc991dea1f97e5eb93cbb1c861925d24114caca Mon Sep 17 00:00:00 2001
From: Corey Hulen <corey@hulen.com>
Date: Mon, 17 Apr 2017 07:55:03 -0700
Subject: PLT-6317 disable file watcher while running from makefile (#6103)

* PLT-6317 disable file watcher while running from make file

* Removing debug stmt
---
 cmd/platform/init.go       | 1 +
 cmd/platform/mattermost.go | 1 +
 cmd/platform/server.go     | 2 ++
 3 files changed, 4 insertions(+)

(limited to 'cmd')

diff --git a/cmd/platform/init.go b/cmd/platform/init.go
index 0458e7a1c..7d01eb890 100644
--- a/cmd/platform/init.go
+++ b/cmd/platform/init.go
@@ -20,6 +20,7 @@ func doLoadConfig(filename string) (err string) {
 	utils.LoadConfig(filename)
 	utils.InitializeConfigWatch()
 	utils.EnableConfigWatch()
+
 	return ""
 }
 
diff --git a/cmd/platform/mattermost.go b/cmd/platform/mattermost.go
index 9f58b3250..a4e44e016 100644
--- a/cmd/platform/mattermost.go
+++ b/cmd/platform/mattermost.go
@@ -30,6 +30,7 @@ func main() {
 
 func init() {
 	rootCmd.PersistentFlags().StringP("config", "c", "config.json", "Configuration file to use.")
+	rootCmd.PersistentFlags().Bool("disableconfigwatch", false, "When set config.json will not be loaded from disk when the file is changed.")
 
 	resetCmd.Flags().Bool("confirm", false, "Confirm you really want to delete everything and a DB backup has been performed.")
 
diff --git a/cmd/platform/server.go b/cmd/platform/server.go
index 234721778..0d971afb6 100644
--- a/cmd/platform/server.go
+++ b/cmd/platform/server.go
@@ -36,6 +36,8 @@ func runServerCmd(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
+	utils.CfgDisableConfigWatch, _ = cmd.Flags().GetBool("disableconfigwatch")
+
 	runServer(config)
 	return nil
 }
-- 
cgit v1.2.3-1-g7c22