summaryrefslogtreecommitdiffstats
path: root/utils/config.go
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-10-23 08:38:15 -0700
committer=Corey Hulen <corey@hulen.com>2015-10-23 08:38:15 -0700
commit028657b43ed7d6e2b0adca322e2d47781c1b3eb4 (patch)
tree7366462741ae8f980f8066d1daa8166ae8a3c17b /utils/config.go
parent009982cd4514c6f0950138b15367df559c8f4dd2 (diff)
parent0cf24be0662fb9ee2a3b52bfb8c3903bc8c32b72 (diff)
downloadchat-028657b43ed7d6e2b0adca322e2d47781c1b3eb4.tar.gz
chat-028657b43ed7d6e2b0adca322e2d47781c1b3eb4.tar.bz2
chat-028657b43ed7d6e2b0adca322e2d47781c1b3eb4.zip
Merge branch 'master' into PLT-25
Diffstat (limited to 'utils/config.go')
-rw-r--r--utils/config.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/utils/config.go b/utils/config.go
index 15d6b217c..fd9856a67 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -26,7 +26,7 @@ const (
var Cfg *model.Config = &model.Config{}
var CfgLastModified int64 = 0
var CfgFileName string = ""
-var ClientProperties map[string]string = map[string]string{}
+var ClientCfg map[string]string = map[string]string{}
var SanitizeOptions map[string]bool = map[string]bool{}
func FindConfigFile(fileName string) string {
@@ -161,7 +161,7 @@ func LoadConfig(fileName string) {
Cfg = &config
SanitizeOptions = getSanitizeOptions(Cfg)
- ClientProperties = getClientProperties(Cfg)
+ ClientCfg = getClientConfig(Cfg)
}
func getSanitizeOptions(c *model.Config) map[string]bool {
@@ -172,7 +172,7 @@ func getSanitizeOptions(c *model.Config) map[string]bool {
return options
}
-func getClientProperties(c *model.Config) map[string]string {
+func getClientConfig(c *model.Config) map[string]string {
props := make(map[string]string)
props["Version"] = model.CurrentVersion