fix: initialize service config on keystone when service boot

This commit is contained in:
Qiu Jian
2020-01-09 22:04:27 +08:00
parent 7c31d1a7da
commit 74af253254
2 changed files with 28 additions and 6 deletions
+7 -2
View File
@@ -82,9 +82,12 @@ func (s *mcclientServiceConfigSession) Merge(opts interface{}, serviceType strin
serviceConf, err := getServiceConfig(s.session, s.serviceId)
if err != nil {
log.Errorf("getServiceConfig for %s failed: %s", serviceType, err)
} else {
} else if serviceConf != nil {
s.config.Update(serviceConf)
merged = true
} else {
// not initialized
s.Upload()
}
}
commonServiceId, _ := getServiceIdByType(s.session, consts.COMMON_SERVICE, "")
@@ -92,9 +95,11 @@ func (s *mcclientServiceConfigSession) Merge(opts interface{}, serviceType strin
commonConf, err := getServiceConfig(s.session, commonServiceId)
if err != nil {
log.Errorf("getServiceConfig for %s failed: %s", consts.COMMON_SERVICE, err)
} else {
} else if commonConf != nil {
s.config.Update(commonConf)
merged = true
} else {
// common not initialized
}
}
if merged {