add some better logging when HTTP server start fails, and make the failure
really hard if the test server can't be resolved (like for ::1 ipv6)
This commit is contained in:
@@ -529,12 +529,12 @@ sub verifyhttp {
|
|||||||
}
|
}
|
||||||
elsif($res == 6) {
|
elsif($res == 6) {
|
||||||
# curl: (6) Couldn't resolve host '::1'
|
# curl: (6) Couldn't resolve host '::1'
|
||||||
logmsg "RUN: failed to resolve host\n";
|
logmsg "RUN: failed to resolve host ($proto://$ip:$port/verifiedserver)\n";
|
||||||
return 0;
|
return -1;
|
||||||
}
|
}
|
||||||
elsif($data || ($res != 7)) {
|
elsif($data || ($res != 7)) {
|
||||||
logmsg "RUN: Unknown server is running on port $port\n";
|
logmsg "RUN: Unknown server is running on port $port\n";
|
||||||
return 0;
|
return -1;
|
||||||
}
|
}
|
||||||
return $pid;
|
return $pid;
|
||||||
}
|
}
|
||||||
@@ -631,9 +631,13 @@ sub verifyserver {
|
|||||||
|
|
||||||
$pid = &$fun($proto, $ip, $port);
|
$pid = &$fun($proto, $ip, $port);
|
||||||
|
|
||||||
if($pid) {
|
if($pid > 0) {
|
||||||
last;
|
last;
|
||||||
}
|
}
|
||||||
|
elsif($pid < 0) {
|
||||||
|
# a real failure, stop trying and bail out
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
sleep(1);
|
sleep(1);
|
||||||
}
|
}
|
||||||
return $pid;
|
return $pid;
|
||||||
|
|||||||
Reference in New Issue
Block a user