diff options
| author | Christopher Speller <crspeller@gmail.com> | 2017-04-17 15:08:56 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-04-17 15:08:56 -0400 |
| commit | 92d8fa4aa8af170d0018baed94a8787d06297e44 (patch) | |
| tree | dc5000a3584952c797c03bf4331282a5e1536848 /utils/config.go | |
| parent | 742bab6429aeb1b581275da3c06af99fe293baab (diff) | |
| parent | 30974533941e73f102505d07badf538cfdbbf3fc (diff) | |
| download | chat-92d8fa4aa8af170d0018baed94a8787d06297e44.tar.gz chat-92d8fa4aa8af170d0018baed94a8787d06297e44.tar.bz2 chat-92d8fa4aa8af170d0018baed94a8787d06297e44.zip | |
Merge branch 'release-3.8'
Diffstat (limited to 'utils/config.go')
| -rw-r--r-- | utils/config.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/utils/config.go b/utils/config.go index a4ec82078..802dfc2e9 100644 --- a/utils/config.go +++ b/utils/config.go @@ -35,6 +35,7 @@ var watcher *fsnotify.Watcher var Cfg *model.Config = &model.Config{} var CfgDiagnosticId = "" var CfgHash = "" +var ClientCfgHash = "" var CfgFileName string = "" var CfgDisableConfigWatch = false var ClientCfg map[string]string = map[string]string{} @@ -323,6 +324,8 @@ func LoadConfig(fileName string) { Cfg = &config CfgHash = fmt.Sprintf("%x", md5.Sum([]byte(Cfg.ToJson()))) ClientCfg = getClientConfig(Cfg) + clientCfgJson, _ := json.Marshal(ClientCfg) + ClientCfgHash = fmt.Sprintf("%x", md5.Sum(clientCfgJson)) // Actions that need to run every time the config is loaded if ldapI := einterfaces.GetLdapInterface(); ldapI != nil { |