Merge branch 'release-3.8'

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 {