From 4fae47db63ebb5190bf2b1b42eae29785d584a8b Mon Sep 17 00:00:00 2001
From: John Guo <john@johng.cn>
Date: Fri, 28 Jan 2022 17:29:05 +0800
Subject: [PATCH] add secondary configuration node name for http server;
 improve package gsvc

---
 frame/gins/gins_server.go | 12 +++++++++---
 net/gsvc/gsvc_registry.go |  6 ++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/frame/gins/gins_server.go b/frame/gins/gins_server.go
index febea4e2c..6580b25fc 100644
--- a/frame/gins/gins_server.go
+++ b/frame/gins/gins_server.go
@@ -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())
diff --git a/net/gsvc/gsvc_registry.go b/net/gsvc/gsvc_registry.go
index 296255726..a73d5e9d6 100644
--- a/net/gsvc/gsvc_registry.go
+++ b/net/gsvc/gsvc_registry.go
@@ -18,7 +18,8 @@ func Register(ctx context.Context, service *Service) error {
 	if defaultRegistry == nil {
 		return gerror.NewCodef(gcode.CodeNotImplemented, `no Registry is registered`)
 	}
-	ctx, _ = context.WithTimeout(ctx, defaultTimeout)
+	ctx, cancel := context.WithTimeout(ctx, defaultTimeout)
+	defer cancel()
 	return defaultRegistry.Register(ctx, service)
 }
 
@@ -27,6 +28,7 @@ func Deregister(ctx context.Context, service *Service) error {
 	if defaultRegistry == nil {
 		return gerror.NewCodef(gcode.CodeNotImplemented, `no Registry is registered`)
 	}
-	ctx, _ = context.WithTimeout(ctx, defaultTimeout)
+	ctx, cancel := context.WithTimeout(ctx, defaultTimeout)
+	defer cancel()
 	return defaultRegistry.Deregister(ctx, service)
 }