diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php index fd246d863..62261db47 100644 --- a/airtime_mvc/application/controllers/ApiController.php +++ b/airtime_mvc/application/controllers/ApiController.php @@ -664,7 +664,6 @@ class ApiController extends Zend_Controller_Action "platform"=>Application_Model_Systemstatus::GetPlatformInfo(), "airtime_version"=>Application_Model_Preference::GetAirtimeVersion(), "services"=>array( - "icecast2"=>Application_Model_Systemstatus::GetIcecastStatus(), "rabbitmq"=>Application_Model_Systemstatus::GetRabbitMqStatus(), "pypo"=>Application_Model_Systemstatus::GetPypoStatus(), "liquidsoap"=>Application_Model_Systemstatus::GetLiquidsoapStatus(), diff --git a/airtime_mvc/application/controllers/SystemstatusController.php b/airtime_mvc/application/controllers/SystemstatusController.php index d78c8e6bb..b4d1c2b3f 100644 --- a/airtime_mvc/application/controllers/SystemstatusController.php +++ b/airtime_mvc/application/controllers/SystemstatusController.php @@ -18,8 +18,7 @@ class SystemstatusController extends Zend_Controller_Action "liquidsoap"=>Application_Model_Systemstatus::GetLiquidsoapStatus(), "show-recorder"=>Application_Model_Systemstatus::GetShowRecorderStatus(), "media-monitor"=>Application_Model_Systemstatus::GetMediaMonitorStatus(), - "rabbitmq-server"=>Application_Model_Systemstatus::GetRabbitMqStatus(), - "icecast2"=>Application_Model_Systemstatus::GetIcecastStatus() + "rabbitmq-server"=>Application_Model_Systemstatus::GetRabbitMqStatus() ); $partitions = Application_Model_Systemstatus::GetDiskInfo(); @@ -27,7 +26,6 @@ class SystemstatusController extends Zend_Controller_Action $this->view->status = new StdClass; $this->view->status->services = $services; $this->view->status->partitions = $partitions; - } public function getLogFileAction() diff --git a/utils/airtime-check-system.php b/utils/airtime-check-system.php index 6fc13060f..4a90dcc2c 100644 --- a/utils/airtime-check-system.php +++ b/utils/airtime-check-system.php @@ -85,10 +85,6 @@ class AirtimeCheck { self::output_status("SHOW_RECORDER_RUNNING_SECONDS", $p_status->services->show_recorder->uptime_seconds); self::output_status("SHOW_RECORDER_MEM_PERC", $p_status->services->show_recorder->memory_perc); self::output_status("SHOW_RECORDER_CPU_PERC", $p_status->services->show_recorder->cpu_perc); - self::output_status("ICECAST_PROCESS_ID", $p_status->services->icecast2->process_id); - self::output_status("ICECAST_RUNNING_SECONDS", $p_status->services->icecast2->uptime_seconds); - self::output_status("ICECAST_MEM_PERC", $p_status->services->icecast2->memory_perc); - self::output_status("ICECAST_CPU_PERC", $p_status->services->icecast2->cpu_perc); self::output_status("RABBITMQ_PROCESS_ID", $p_status->services->rabbitmq->process_id); self::output_status("RABBITMQ_RUNNING_SECONDS", $p_status->services->rabbitmq->uptime_seconds); self::output_status("RABBITMQ_MEM_PERC", $p_status->services->rabbitmq->memory_perc);