fix bug of host.Extract (#1481)

go-kratos · Sep 15, 2021 · 2ce8f22 · 2ce8f22
1 parent 24ec23f
commit 2ce8f22
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/internal/host/host.go b/internal/host/host.go
@@ -36,7 +36,7 @@ func Port(lis net.Listener) (int, bool) {
 // Extract returns a private addr and port.
 func Extract(hostPort string, lis net.Listener) (string, error) {
 	addr, port, err := net.SplitHostPort(hostPort)
-	if err != nil {
+	if err != nil && lis == nil {
 		return "", err
 	}
 	if lis != nil {

diff --git a/internal/host/host_test.go b/internal/host/host_test.go
@@ -76,6 +76,13 @@ func TestExtract(t *testing.T) {
 			}
 		})
 	}
+	lis, err := net.Listen("tcp", ":12345")
+	assert.NoError(t, err)
+	res, err := Extract("", lis)
+	assert.NoError(t, err)
+	expect, err := Extract(lis.Addr().String(), nil)
+	assert.NoError(t, err)
+	assert.Equal(t, expect, res)
 }
 
 func TestExtract2(t *testing.T) {