Merge branch '2.3.x' into devel

This commit is contained in:
Martin Konecny 2013-03-06 13:46:01 -05:00
commit 5ceeb88899
23 changed files with 394 additions and 118 deletions

View file

@ -205,17 +205,6 @@ class AirtimeCheck {
$log = "/var/log/airtime/media-monitor/media-monitor.log";
self::show_log_file($log);
}
if (isset($services->rabbitmq)) {
self::output_status("RABBITMQ_PROCESS_ID", $data->services->rabbitmq->process_id);
self::output_status("RABBITMQ_RUNNING_SECONDS", $data->services->rabbitmq->uptime_seconds);
self::output_status("RABBITMQ_MEM_PERC", $data->services->rabbitmq->memory_perc);
self::output_status("RABBITMQ_CPU_PERC", $data->services->rabbitmq->cpu_perc);
} else {
self::output_status("RABBITMQ_PROCESS_ID", "FAILED");
self::output_status("RABBITMQ_RUNNING_SECONDS", "0");
self::output_status("RABBITMQ_MEM_PERC", "0%");
self::output_status("RABBITMQ_CPU_PERC", "0%");
}
}
if (self::$AIRTIME_STATUS_OK){