Merge pull request #228 from tangle329/master

Fix worker check issue
kubernetes · Feb 7, 2017 · 4eb527d · 4eb527d
2 parents f663ca4 + 008c47c
commit 4eb527d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/controllers/nginx/pkg/cmd/controller/nginx.go b/controllers/nginx/pkg/cmd/controller/nginx.go
@@ -132,10 +132,10 @@ NGINX master process died (%v): %v
 		// we wait until the workers are killed
 		for {
 			conn, err := net.DialTimeout("tcp", "127.0.0.1:80", 1*time.Second)
-			if err == nil {
-				conn.Close()
+			if err != nil {
 				break
 			}
+			conn.Close()
 			time.Sleep(1 * time.Second)
 		}
 		// start a new nginx master process