Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

airtime-check-system not using user define port in all cases

This commit is contained in:
Martin Konecny 2012-08-13 11:04:21 -04:00
parent 028f6636dd
commit 7cd814da06
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
utils/airtime-check-system.php
View File

@ -17,7 +17,7 @@ if (substr($sapi_type, 0, 3) == 'cli') {
$status = AirtimeCheck::GetStatus($baseUrl, $base_port, $apiKey); $status = AirtimeCheck::GetStatus($baseUrl, $base_port, $apiKey);
AirtimeCheck::PrintStatus($baseUrl, $status); AirtimeCheck::PrintStatus($baseUrl, $base_port, $status);
} }
class AirtimeCheck { class AirtimeCheck {
@ -92,8 +92,9 @@ class AirtimeCheck {
return $os_string." ".$machine; return $os_string." ".$machine;
} }
public static function GetServerType($p_baseUrl){ public static function GetServerType($p_baseUrl, $p_basePort)
$headerInfo = get_headers("http://$p_baseUrl",1); {
$headerInfo = get_headers("http://$p_baseUrl:$p_basePort",1);
if (!isset($headerInfo['Server'][0])) if (!isset($headerInfo['Server'][0]))
return self::UNKNOWN; return self::UNKNOWN;
@ -120,7 +121,7 @@ class AirtimeCheck {
return $data; return $data;
} }
public static function PrintStatus($p_baseUrl, $p_status){ public static function PrintStatus($p_baseUrl, $p_basePort, $p_status){
if ($p_status === false){ if ($p_status === false){
self::output_status("AIRTIME_SERVER_RESPONDING", "FAILED"); self::output_status("AIRTIME_SERVER_RESPONDING", "FAILED");
@ -150,7 +151,7 @@ class AirtimeCheck {
} }
self::output_status("OS", self::CheckOsTypeVersion()); self::output_status("OS", self::CheckOsTypeVersion());
self::output_status("CPU", self::GetCpuInfo()); self::output_status("CPU", self::GetCpuInfo());
self::output_status("WEB_SERVER", self::GetServerType($p_baseUrl)); self::output_status("WEB_SERVER", self::GetServerType($p_baseUrl, $p_basePort));
if (isset($data->services)) { if (isset($data->services)) {
$services = $data->services; $services = $data->services;