summaryrefslogtreecommitdiffstats
path: root/utils/config.go
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2015-10-12 14:22:05 -0700
committerCorey Hulen <corey@hulen.com>2015-10-12 14:22:05 -0700
commit191e248b0fbe833c0c52e1e6145f4d19b4c3a7b6 (patch)
tree63378d3100f0a70806767c87886b3e0b9037f8c5 /utils/config.go
parent246c7414bd2f22a3440af5df7d72f33e7207dc50 (diff)
parenta6a3c351a828441313e90c1ac8e6afbfadad1f7c (diff)
downloadchat-191e248b0fbe833c0c52e1e6145f4d19b4c3a7b6.tar.gz
chat-191e248b0fbe833c0c52e1e6145f4d19b4c3a7b6.tar.bz2
chat-191e248b0fbe833c0c52e1e6145f4d19b4c3a7b6.zip
Merge pull request #1022 from mattermost/release-1.1.0
Release 1.1.0rc merging to master
Diffstat (limited to 'utils/config.go')
-rw-r--r--utils/config.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/utils/config.go b/utils/config.go
index 44ee14a6e..2c6f30bf0 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -150,6 +150,8 @@ func LoadConfig(fileName string) {
CfgFileName = fileName
}
+ config.SetDefaults()
+
if err := config.IsValid(); err != nil {
panic("Error validating config file=" + fileName + ", err=" + err.Message)
}