diff options
| author | Elias Nahum <nahumhbl@gmail.com> | 2016-08-09 17:05:59 -0500 |
|---|---|---|
| committer | Elias Nahum <nahumhbl@gmail.com> | 2016-08-09 17:05:59 -0500 |
| commit | 805659239098a0b382a2a8bad704c2e91ab38ed6 (patch) | |
| tree | e2c42b89d7ffc830bd9270cc65780fe470ccb4f4 /utils | |
| parent | 7be82c2b279390d3659fbe74c7d3ccabc48a6dd8 (diff) | |
| parent | ac2f75ac8fd4e2d7ae1de6703a156b9636d4b8f0 (diff) | |
| download | chat-805659239098a0b382a2a8bad704c2e91ab38ed6.tar.gz chat-805659239098a0b382a2a8bad704c2e91ab38ed6.tar.bz2 chat-805659239098a0b382a2a8bad704c2e91ab38ed6.zip | |
Merge branch 'release-3.3' RC3
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/config.go | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/utils/config.go b/utils/config.go index a1a6becd1..6646a341e 100644 --- a/utils/config.go +++ b/utils/config.go @@ -186,7 +186,7 @@ func LoadConfig(fileName string) { Cfg = &config CfgHash = fmt.Sprintf("%x", md5.Sum([]byte(Cfg.ToJson()))) - RegenerateClientConfig() + ClientCfg = getClientConfig(Cfg) // Actions that need to run every time the config is loaded if ldapI := einterfaces.GetLdapInterface(); ldapI != nil { @@ -199,10 +199,6 @@ func LoadConfig(fileName string) { } } -func RegenerateClientConfig() { - ClientCfg = getClientConfig(Cfg) -} - func getClientConfig(c *model.Config) map[string]string { props := make(map[string]string) |