add secondary configuration node name for http server; improve package gsvc

This commit is contained in:
John Guo
2022-01-28 17:29:05 +08:00
parent 48b5f37894
commit 4fae47db63
2 changed files with 13 additions and 5 deletions

View File

@ -17,8 +17,9 @@ import (
)
const (
frameCoreComponentNameServer = "gf.core.component.server"
configNodeNameServer = "server"
frameCoreComponentNameServer = "gf.core.component.server"
configNodeNameServer = "server"
configNodeNameServerSecondary = "httpserver"
)
// Server returns an instance of http server with specified name.
@ -38,12 +39,17 @@ func Server(name ...interface{}) *ghttp.Server {
var (
serverConfigMap map[string]interface{}
serverLoggerConfigMap map[string]interface{}
configNodeName = configNodeNameServer
configNodeName string
)
if configData, _ := Config().Data(ctx); len(configData) > 0 {
if v, _ := gutil.MapPossibleItemByKey(configData, configNodeNameServer); v != "" {
configNodeName = v
}
if configNodeName == "" {
if v, _ := gutil.MapPossibleItemByKey(configData, configNodeNameServerSecondary); v != "" {
configNodeName = v
}
}
}
// Server configuration.
certainConfigNodeName := fmt.Sprintf(`%s.%s`, configNodeName, s.GetName())