summaryrefslogtreecommitdiffstats
path: root/utils/config.go
diff options
context:
space:
mode:
authorReed Garmsen <rgarmsen2295@gmail.com>2015-06-17 11:29:13 -0700
committerReed Garmsen <rgarmsen2295@gmail.com>2015-06-17 11:29:13 -0700
commit50c97f415524c400e5c9877ff4107ed9e22d96cd (patch)
tree663777ab07dd43367c6e591ed5163bfbd9302a49 /utils/config.go
parente142a8cb24a1edae8df569dd9971d561330d30bc (diff)
parentf34074a45595a9b4d0a66acd656fe0146a8781cf (diff)
downloadchat-50c97f415524c400e5c9877ff4107ed9e22d96cd.tar.gz
chat-50c97f415524c400e5c9877ff4107ed9e22d96cd.tar.bz2
chat-50c97f415524c400e5c9877ff4107ed9e22d96cd.zip
Merge pull request #6 from rgarmsen2295/master
Remerging
Diffstat (limited to 'utils/config.go')
-rw-r--r--utils/config.go5
1 files changed, 5 insertions, 0 deletions
diff --git a/utils/config.go b/utils/config.go
index 745887c70..418041706 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -222,6 +222,11 @@ func LoadConfig(fileName string) {
config.ServiceSettings.Domain = os.Getenv("MATTERMOST_DOMAIN")
}
+ // Validates our mail settings
+ if err := CheckMailSettings(); err != nil {
+ l4g.Error("Email settings are not valid err=%v", err)
+ }
+
configureLog(config.LogSettings)
Cfg = &config