address comments

Signed-off-by: lhy1024 <admin@liudos.us>
tikv · Feb 24, 2023 · c4e2d3d · c4e2d3d
1 parent 918d2b5
commit c4e2d3d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/pkg/mcs/resource_manager/server/server.go b/pkg/mcs/resource_manager/server/server.go
@@ -63,6 +63,7 @@ type Server struct {
 	cfg         *Config
 	name        string
 	backendUrls []url.URL
+	listenUrl   *url.URL
 
 	etcdClient *clientv3.Client
 	httpClient *http.Client
@@ -250,12 +251,15 @@ func (s *Server) startServer() error {
 	if err != nil {
 		return err
 	}
-	s.cfg.ListenAddr = strings.TrimPrefix(s.cfg.ListenAddr, "http://")
-	s.cfg.ListenAddr = strings.TrimPrefix(s.cfg.ListenAddr, "https://")
+	s.listenUrl, err = url.Parse(s.cfg.ListenAddr)
+	if err != nil {
+		return err
+	}
+	println("===========", s.listenUrl.String(), s.cfg.ListenAddr, s.listenUrl.Host)
 	if tlsConfig != nil {
-		s.muxListener, err = tls.Listen(tcp, s.cfg.ListenAddr, tlsConfig)
+		s.muxListener, err = tls.Listen(tcp, s.listenUrl.Host, tlsConfig)
 	} else {
-		s.muxListener, err = net.Listen(tcp, s.cfg.ListenAddr)
+		s.muxListener, err = net.Listen(tcp, s.listenUrl.Host)
 	}
 	if err != nil {
 		return err

diff --git a/tests/mcs/resource_manager/server_test.go b/tests/mcs/resource_manager/server_test.go
@@ -58,7 +58,7 @@ func TestResourceManagerServer(t *testing.T) {
 	defer svr.Close()
 
 	// Test registered GRPC Service
-	cc, err := grpc.DialContext(ctx, cfg.ListenAddr, grpc.WithInsecure())
+	cc, err := grpc.DialContext(ctx, strings.TrimPrefix(cfg.ListenAddr, "http://"), grpc.WithInsecure())
 	re.NoError(err)
 	defer cc.Close()
 	c := rmpb.NewResourceManagerClient(cc)
@@ -68,7 +68,7 @@ func TestResourceManagerServer(t *testing.T) {
 	re.ErrorContains(err, "resource group not found")
 
 	// Test registered REST HTTP Handler
-	url := "http://" + cfg.ListenAddr + "/resource-manager/api/v1/config"
+	url := cfg.ListenAddr + "/resource-manager/api/v1/config"
 	{
 		resp, err := http.Get(url + "/groups")
 		re.NoError(err)