summaryrefslogtreecommitdiffstats
path: root/cmd/platform/server.go
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2017-01-27 09:30:33 -0500
committerChristopher Speller <crspeller@gmail.com>2017-01-27 09:30:33 -0500
commit8d2e8525a445a80085282142375b0cc68916d552 (patch)
treec2627b71c568346bbcca7be4a555744e3c2c757c /cmd/platform/server.go
parentcfbace70ca4222e7abba92c5e3af7440539452c7 (diff)
parent0d8bb03b5773923cf52f4d8cb2711131caae105c (diff)
downloadchat-8d2e8525a445a80085282142375b0cc68916d552.tar.gz
chat-8d2e8525a445a80085282142375b0cc68916d552.tar.bz2
chat-8d2e8525a445a80085282142375b0cc68916d552.zip
Merge branch 'release-3.6'
Diffstat (limited to 'cmd/platform/server.go')
-rw-r--r--cmd/platform/server.go6
1 files changed, 6 insertions, 0 deletions
diff --git a/cmd/platform/server.go b/cmd/platform/server.go
index 5abc4d6e8..560403a6b 100644
--- a/cmd/platform/server.go
+++ b/cmd/platform/server.go
@@ -38,6 +38,12 @@ func runServerCmd(cmd *cobra.Command, args []string) error {
if err != nil {
return err
}
+
+ // Backwards compatibility with -config flag
+ if flagConfigFile != "" {
+ config = flagConfigFile
+ }
+
runServer(config)
return nil
}