Merge branch 'master' into remove-lic

stolostron · Mar 30, 2020 · 04b5700 · 04b5700
2 parents 9d1e200 + a42eb32
commit 04b5700
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/pkg/ingress/controller/process/nginx.go b/pkg/ingress/controller/process/nginx.go
@@ -54,7 +54,11 @@ func WaitUntilPortIsAvailable(port int) {
 		if err != nil {
 			break
 		}
-		conn.Close()
+
+		if err := conn.Close(); err != nil {
+			glog.Errorf("failed to colse connection: %v", err)
+		}
+
 		// kill nginx worker processes
 		fs, err := proc.NewFS("/proc")
 		if err != nil {
@@ -76,7 +80,11 @@ func WaitUntilPortIsAvailable(port int) {
 					glog.Errorf("unexpected error obtaining process information: %v", err)
 					continue
 				}
-				osp.Signal(syscall.SIGQUIT)
+
+				if err := osp.Signal(syscall.SIGQUIT); err != nil {
+					glog.Errorf("failed to send signal: %v", err)
+				}
+
 			}
 		}
 		time.Sleep(100 * time.Millisecond)

diff --git a/pkg/net/net.go b/pkg/net/net.go
@@ -20,6 +20,8 @@ import (
 	"fmt"
 	_net "net"
 	"os/exec"
+
+	"github.com/golang/glog"
 )
 
 // IsIPV6 checks if the input contains a valid IPV6 address
@@ -33,7 +35,10 @@ func IsPortAvailable(p int) bool {
 	if err != nil {
 		return false
 	}
-	ln.Close()
+
+	if err := ln.Close(); err != nil {
+		glog.Errorf("failed to colse listener: %v", err)
+	}
 	return true
 }