Correctly handle connect errors

knizhnik · kelvich · commit b85c8af760a2 · 2017-11-13T02:17:40.000+03:00
diff --git a/arbiter.c b/arbiter.c
@@ -473,8 +473,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
`@@ -473,8 +473,12 @@ static int MtmConnectSocket(int node, int port)`
`473`	`473`	`MTM_ELOG(WARNING, "Arbiter trying to connect to %s:%d: %s", host, port, strerror(errcode));`
`474`	`474`	`goto Error;`
`475`	`475`	`}`
`476`		`- } else {`
`477`		`- MTM_ELOG(WARNING, "Arbiter waiting socket to %s:%d: %s", host, port, strerror(errno));`
	`476`	`+ } else if (rc == 0) {`
	`477`	`+ MTM_ELOG(WARNING, "Arbiter failed to connect to socket to %s:%d within specified timeout", host, port);`
	`478`	`+ goto Error;`
	`479`	`+ } else {`
	`480`	`+ MTM_ELOG(WARNING, "Arbiter failed to wait socket to %s:%d: %s", host, port, strerror(errno));`
	`481`	`+ goto Error;`
`478`	`482`	`}`
`479`	`483`	`}`
`480`	`484`	`else if (rc != 0) {`