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

CC-2395: airtime-check-system reports an error even though everything looks ok

Browse source
This commit is contained in:
martin 2011-06-23 09:50:57 -04:00
parent 52e41555bd
commit 8dd0d4132d
1 changed files with 10 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

32
utils/airtime-check-system.php
View file

@ -21,7 +21,7 @@ AirtimeCheck::PythonLibrariesInstalled();
AirtimeCheck::CheckRabbitMqConnection($airtimeIni); AirtimeCheck::CheckRabbitMqConnection($airtimeIni);
AirtimeCheck::CheckApacheVHostFiles(); //AirtimeCheck::CheckApacheVHostFiles();
AirtimeCheck::GetAirtimeServerVersion($pypoCfg); AirtimeCheck::GetAirtimeServerVersion($pypoCfg);
AirtimeCheck::CheckAirtimePlayoutRunning(); AirtimeCheck::CheckAirtimePlayoutRunning();
@ -151,7 +151,7 @@ class AirtimeCheck {
$status = AirtimeCheck::CHECK_FAILED; $status = AirtimeCheck::CHECK_FAILED;
if (count($output) > 0){ if (count($output) > 0){
$delimited = split("[ ]+", $output[0]); $delimited = preg_split("/[\s]+/", $output[0]);
$status = $delimited[1]; $status = $delimited[1];
} else { } else {
self::$check_system_ok = false; self::$check_system_ok = false;
@ -164,7 +164,7 @@ class AirtimeCheck {
$command = "cat /proc/cpuinfo |grep -m 1 'model name' "; $command = "cat /proc/cpuinfo |grep -m 1 'model name' ";
exec($command, $output, $result); exec($command, $output, $result);
$choppedStr = split(":", $output[0]); $choppedStr = explode(":", $output[0]);
$status = trim($choppedStr[1]); $status = trim($choppedStr[1]);
output_status("CPU", $status); output_status("CPU", $status);
} }
@ -173,14 +173,14 @@ class AirtimeCheck {
{ {
$command = "cat /proc/meminfo |grep 'MemTotal' "; $command = "cat /proc/meminfo |grep 'MemTotal' ";
exec($command, $output, $result); exec($command, $output, $result);
$choppedStr = split(":", $output[0]); $choppedStr = explode(":", $output[0]);
$status = trim($choppedStr[1]); $status = trim($choppedStr[1]);
output_status("Total RAM", $status); output_status("Total RAM", $status);
$output = null; $output = null;
$command = "cat /proc/meminfo |grep 'MemFree' "; $command = "cat /proc/meminfo |grep 'MemFree' ";
exec($command, $output, $result); exec($command, $output, $result);
$choppedStr = split(":", $output[0]); $choppedStr = explode(":", $output[0]);
$status = trim($choppedStr[1]); $status = trim($choppedStr[1]);
output_status("Free RAM", $status); output_status("Free RAM", $status);
} }
@ -191,6 +191,7 @@ class AirtimeCheck {
$confFiles = array("airtime.conf", $confFiles = array("airtime.conf",
"liquidsoap.cfg", "liquidsoap.cfg",
"pypo.cfg", "pypo.cfg",
"media-monitor.cfg",
"recorder.cfg"); "recorder.cfg");
$allFound = AirtimeCheck::CHECK_OK; $allFound = AirtimeCheck::CHECK_OK;
@ -200,6 +201,7 @@ class AirtimeCheck {
if (!file_exists($fullPath)){ if (!file_exists($fullPath)){
$allFound = AirtimeCheck::CHECK_FAILED; $allFound = AirtimeCheck::CHECK_FAILED;
self::$check_system_ok = false; self::$check_system_ok = false;
break;
} }
} }
@ -257,7 +259,7 @@ class AirtimeCheck {
$status = AirtimeCheck::CHECK_FAILED; $status = AirtimeCheck::CHECK_FAILED;
if (count($output[0]) > 0){ if (count($output[0]) > 0){
$key_value = split("==", $output[0]); $key_value = explode("==", $output[0]);
$status = trim($key_value[1]); $status = trim($key_value[1]);
} else { } else {
self::$check_system_ok = false; self::$check_system_ok = false;
@ -271,7 +273,7 @@ class AirtimeCheck {
$status = AirtimeCheck::CHECK_FAILED; $status = AirtimeCheck::CHECK_FAILED;
if (count($output[0]) > 0){ if (count($output[0]) > 0){
$key_value = split("==", $output[0]); $key_value = explode("==", $output[0]);
$status = trim($key_value[1]); $status = trim($key_value[1]);
} else { } else {
self::$check_system_ok = false; self::$check_system_ok = false;
@ -412,7 +414,7 @@ class AirtimeCheck {
// Figure out if 32 or 64 bit // Figure out if 32 or 64 bit
$command = "file -b /sbin/init"; $command = "file -b /sbin/init";
exec($command, $output, $result); exec($command, $output, $result);
$splitStr = split(",", $output[0]); $splitStr = explode(",", $output[0]);
$os_string .= $splitStr[1]; $os_string .= $splitStr[1];
output_status("OS", $os_string); output_status("OS", $os_string);
@ -423,20 +425,6 @@ class AirtimeCheck {
// error handler function // error handler function
function myErrorHandler($errno, $errstr, $errfile, $errline) function myErrorHandler($errno, $errstr, $errfile, $errline)
{ {
return true;
/*
if ($errno == E_WARNING){
if (strpos($errstr, "401") !== false){
echo "\t\tServer is running but could not find Airtime".PHP_EOL;
} else if (strpos($errstr, "Connection refused") !== false){
echo "\t\tServer does not appear to be running".PHP_EOL;
} else {
//echo $errstr;
}
}
//Don't execute PHP internal error handler //Don't execute PHP internal error handler
return true; return true;
*/
} }