Correctly handle connect errors

knizhnik · knizhnik · commit 4a1e4c2206ea · 2017-05-31T12:04:12.000+03:00
diff --git a/contrib/mmts/arbiter.c b/contrib/mmts/arbiter.c
@@ -467,8 +467,12 @@ static int MtmConnectSocket(int node, int port)
 				MTM_ELOG(WARNING, "Arbiter trying to connect to %s:%d: %s", host, port, strerror(errcode));
 				goto Error;
 			}
-		} else {
-			MTM_ELOG(WARNING, "Arbiter waiting socket to %s:%d: %s", host, port, strerror(errno));
+		} else if (rc == 0) {
+			MTM_ELOG(WARNING, "Arbiter failed to connect to socket to %s:%d within specified timeout", host, port);
+			goto Error;
+		} else { 
+			MTM_ELOG(WARNING, "Arbiter failed to wait socket to %s:%d: %s", host, port, strerror(errno));
+			goto Error;
 		}
 	}
 	else if (rc != 0) {

Original file line number	Diff line number	Diff line change
`@@ -467,8 +467,12 @@ static int MtmConnectSocket(int node, int port)`
`467`	`467`	`MTM_ELOG(WARNING, "Arbiter trying to connect to %s:%d: %s", host, port, strerror(errcode));`
`468`	`468`	`goto Error;`
`469`	`469`	`}`
`470`		`- } else {`
`471`		`- MTM_ELOG(WARNING, "Arbiter waiting socket to %s:%d: %s", host, port, strerror(errno));`
	`470`	`+ } else if (rc == 0) {`
	`471`	`+ MTM_ELOG(WARNING, "Arbiter failed to connect to socket to %s:%d within specified timeout", host, port);`
	`472`	`+ goto Error;`
	`473`	`+ } else {`
	`474`	`+ MTM_ELOG(WARNING, "Arbiter failed to wait socket to %s:%d: %s", host, port, strerror(errno));`
	`475`	`+ goto Error;`
`472`	`476`	`}`
`473`	`477`	`}`
`474`	`478`	`else if (rc != 0) {`