2
0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-29 09:13:08 +00:00

Merge pull request #5861 from xuweibj/port

enhance pr 5715 of httpport check
This commit is contained in:
Gᴏɴɢ Jie 2018-12-03 10:24:55 +08:00 committed by GitHub
commit 2088bec4aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -290,11 +290,11 @@ sub is_http_ready {
my $installdir = shift;
my $errormsg_ref = shift;
my $http_status = `netstat -tunlp | grep -e "httpd" -e "apache" | grep "LISTEN" 2>&1`;
my $http_status = `netstat -tnlp | grep -e "httpd" -e "apache" 2>&1`;
if (!$http_status) {
$$errormsg_ref = "No HTTP listening status get by command 'netstat'";
return 0;
} elsif ($http_status !~ /\S*\s+\S*\s+\S*\s+\S*$httpport\s+.+/) {
} elsif ($http_status !~ /\S*\s+\S*\s+\S*\s+\S*:$httpport\s+.+/) {
$$errormsg_ref = "The port defined in 'site' table HTTP is not listening";
return 0;
}