Merge pull request #166 from yuzhiquan/bugfix-handle-error

Handle resolve unix addr error
AliyunContainerService · Dec 25, 2020 · 224ee8c · 224ee8c
2 parents 70d3197 + 84b5c55
commit 224ee8c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cli/main.go b/cli/main.go
@@ -57,7 +57,7 @@ func main() {
 		func(ctx context.Context, s string) (net.Conn, error) {
 			unixAddr, err := net.ResolveUnixAddr("unix", defaultSocketPath)
 			if err != nil {
-				return nil, nil
+				return nil, fmt.Errorf("error while resolve unix addr:%w", err)
 			}
 			d := net.Dialer{}
 			return d.DialContext(ctx, "unix", unixAddr.String())

diff --git a/plugin/terway/cni.go b/plugin/terway/cni.go
@@ -549,7 +549,7 @@ func getNetworkClient() (rpc.TerwayBackendClient, func(), error) {
 		func(ctx context.Context, s string) (net.Conn, error) {
 			unixAddr, err := net.ResolveUnixAddr("unix", defaultSocketPath)
 			if err != nil {
-				return nil, nil
+				return nil, fmt.Errorf("error while resolve unix addr:%w", err)
 			}
 			d := net.Dialer{}
 			return d.DialContext(timeoutCtx, "unix", unixAddr.String())