From 1555c83668544dea9cbf84d1d1bdafce31597852 Mon Sep 17 00:00:00 2001 From: martin Date: Tue, 13 Sep 2011 17:20:34 -0400 Subject: [PATCH 1/2] CC-2750: Ability to query health status for pypo, liquidsoap, media monitor, and recorder -cleanup --- python_apps/pypo/pypofetch.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/python_apps/pypo/pypofetch.py b/python_apps/pypo/pypofetch.py index 1d497b834..f7bab2573 100644 --- a/python_apps/pypo/pypofetch.py +++ b/python_apps/pypo/pypofetch.py @@ -90,8 +90,6 @@ class PypoFetch(Thread): elif command == 'cancel_current_show': logger.info("Cancel current show command received...") self.stop_current_show() - elif command == 'get_status': - self.get_status() except Exception, e: logger.error("Exception in handling RabbitMQ message: %s", e) finally: @@ -99,11 +97,7 @@ class PypoFetch(Thread): try: message.ack() except MessageStateError, m: - logger.error("Message ACK error: %s", m); - - def get_status(self): - logger = logging.getLogger('fetch') - logger.debug("get_status") + logger.error("Message ACK error: %s", m) def stop_current_show(self): logger = logging.getLogger('fetch') From 583a5faf72f497cc43f7496fd7c9da40138dd45e Mon Sep 17 00:00:00 2001 From: martin Date: Tue, 13 Sep 2011 18:43:16 -0400 Subject: [PATCH 2/2] CC-2750: Ability to query health status for pypo, liquidsoap, media monitor, and recorder --- .../application/controllers/ApiController.php | 4 +- .../controllers/SystemstatusController.php | 21 +++-- .../application/models/Systemstatus.php | 77 +++++++++++++++---- .../views/scripts/systemstatus/index.phtml | 9 ++- python_apps/monit/airtime-monit.cfg | 4 + 5 files changed, 86 insertions(+), 29 deletions(-) diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php index 763a10889..79bf2aca9 100644 --- a/airtime_mvc/application/controllers/ApiController.php +++ b/airtime_mvc/application/controllers/ApiController.php @@ -653,8 +653,8 @@ class ApiController extends Zend_Controller_Action */ $status = array( - "airtime_version"=>Application_Model_Systemstatus::GetAirtimeVersion(), - "icecast"=>Application_Model_Systemstatus::GetIcecastStatus(), + //"airtime_version"=>Application_Model_Systemstatus::GetAirtimeVersion(), + "icecast2"=>Application_Model_Systemstatus::GetIcecastStatus(), "pypo"=>Application_Model_Systemstatus::GetPypoStatus(), "liquidsoap"=>Application_Model_Systemstatus::GetLiquidsoapStatus(), "show-recorder"=>Application_Model_Systemstatus::GetShowRecorderStatus(), diff --git a/airtime_mvc/application/controllers/SystemstatusController.php b/airtime_mvc/application/controllers/SystemstatusController.php index 7059fad0f..810d5478f 100644 --- a/airtime_mvc/application/controllers/SystemstatusController.php +++ b/airtime_mvc/application/controllers/SystemstatusController.php @@ -9,19 +9,24 @@ class SystemstatusController extends Zend_Controller_Action public function indexAction() { - $ss = new Application_Model_Systemstatus(); - - $stats = array("Total R"); + $status = array( + "icecast2"=>Application_Model_Systemstatus::GetIcecastStatus(), + "pypo"=>Application_Model_Systemstatus::GetPypoStatus(), + "liquidsoap"=>Application_Model_Systemstatus::GetLiquidsoapStatus(), + "show-recorder"=>Application_Model_Systemstatus::GetShowRecorderStatus(), + "media-monitor"=>Application_Model_Systemstatus::GetMediaMonitorStatus() + ); - $this->view->status = $ss->getResults(); + $this->view->status = $status; } public function getLogFileAction() { - $log_files = array("PLAYOUT_ENGINE_RUNNING_SECONDS"=>"/var/log/airtime/pypo/pypo.log", - "LIQUIDSOAP_RUNNING_SECONDS"=>"/var/log/airtime/pypo-liquidsoap/ls_script.log", - "MEDIA_MONITOR_RUNNING_SECONDS"=>"/var/log/airtime/media-monitor/media-monitor.log", - "SHOW_RECORDER_RUNNING_SECONDS"=>"/var/log/airtime/show-recorder/show-recorder.log"); + $log_files = array("pypo"=>"/var/log/airtime/pypo/pypo.log", + "liquidsoap"=>"/var/log/airtime/pypo-liquidsoap/ls_script.log", + "media-monitor"=>"/var/log/airtime/media-monitor/media-monitor.log", + "show-recorder"=>"/var/log/airtime/show-recorder/show-recorder.log", + "icecast2"=>"/var/log/icecast2/error.log"); $id = $this->_getParam('id'); Logging::log($id); diff --git a/airtime_mvc/application/models/Systemstatus.php b/airtime_mvc/application/models/Systemstatus.php index ba9249e37..abb3c0b88 100644 --- a/airtime_mvc/application/models/Systemstatus.php +++ b/airtime_mvc/application/models/Systemstatus.php @@ -3,48 +3,93 @@ class Application_Model_Systemstatus { - public static function GetPypoStatus(){ + public static function GetMonitStatus(){ - RabbitMq::SendMessageToPypo("get_status", array()); + $url = "http://localhost:2812/_status?format=xml"; + $ch = curl_init(); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); + curl_setopt($ch, CURLOPT_URL, $url); + curl_setopt($ch, CURLOPT_USERPWD, "admin:monit"); + $result = curl_exec($ch); + curl_close($ch); + + $xmlDoc = new DOMDocument(); + $xmlDoc->loadXML($result); + + return $xmlDoc->documentElement; + } + + public static function ExtractServiceInformation($p_docRoot, $p_serviceName){ + + $data = array("pid"=>"UNKNOWN", + "uptime"=>"UNKNOWN"); + + foreach ($p_docRoot->getElementsByTagName("service") AS $item) + { + if ($item->getElementsByTagName("name")->item(0)->nodeValue == $p_serviceName){ + $data["pid"] = $item->getElementsByTagName("pid")->item(0)->nodeValue; + $data["uptime"] = $item->getElementsByTagName("uptime")->item(0)->nodeValue."s"; + break; + } + } + return $data; + } + + public static function GetPypoStatus(){ + $docRoot = self::GetMonitStatus(); + $data = self::ExtractServiceInformation($docRoot, "airtime-playout"); + return array( - "process_id"=>500, - "uptime_seconds"=>3600 + "process_id"=>$data["pid"], + "uptime_seconds"=>$data["uptime"] ); } public static function GetLiquidsoapStatus(){ + $docRoot = self::GetMonitStatus(); + $data = self::ExtractServiceInformation($docRoot, "airtime-liquidsoap"); + return array( - "process_id"=>500, - "uptime_seconds"=>3600 + "process_id"=>$data["pid"], + "uptime_seconds"=>$data["uptime"] ); } public static function GetShowRecorderStatus(){ + $docRoot = self::GetMonitStatus(); + $data = self::ExtractServiceInformation($docRoot, "airtime-show-recorder"); + return array( - "process_id"=>500, - "uptime_seconds"=>3600 + "process_id"=>$data["pid"], + "uptime_seconds"=>$data["uptime"] ); } - public static function GetMediaMonitorStatus(){ + public static function GetMediaMonitorStatus(){ + $docRoot = self::GetMonitStatus(); + $data = self::ExtractServiceInformation($docRoot, "airtime-media-monitor"); + return array( - "process_id"=>500, - "uptime_seconds"=>3600 + "process_id"=>$data["pid"], + "uptime_seconds"=>$data["uptime"] ); } - public static function GetIcecastStatus(){ + public static function GetIcecastStatus(){ + $docRoot = self::GetMonitStatus(); + $data = self::ExtractServiceInformation($docRoot, "icecast2"); + return array( - "process_id"=>500, - "uptime_seconds"=>3600 + "process_id"=>$data["pid"], + "uptime_seconds"=>$data["uptime"] ); } public static function GetAirtimeVersion(){ return AIRTIME_VERSION; } - +/* private function getCheckSystemResults(){ @@ -94,4 +139,6 @@ class Application_Model_Systemstatus private function convertRunTimeToPassFail($runTime){ return $runTime > 3 ? "Pass" : "Fail"; } + + */ } diff --git a/airtime_mvc/application/views/scripts/systemstatus/index.phtml b/airtime_mvc/application/views/scripts/systemstatus/index.phtml index 9b48f5c7f..aa6ccaae5 100644 --- a/airtime_mvc/application/views/scripts/systemstatus/index.phtml +++ b/airtime_mvc/application/views/scripts/systemstatus/index.phtml @@ -1,9 +1,10 @@ status as $key=>$value): ?> -
- - - + + + + + Log file
diff --git a/python_apps/monit/airtime-monit.cfg b/python_apps/monit/airtime-monit.cfg index ba4f0878d..7ac74e00c 100644 --- a/python_apps/monit/airtime-monit.cfg +++ b/python_apps/monit/airtime-monit.cfg @@ -22,3 +22,7 @@ with pidfile "/var/run/airtime-show-recorder.pid" start program = "/etc/init.d/airtime-show-recorder start" with timeout 10 seconds stop program = "/etc/init.d/airtime-show-recorder stop" + check process icecast2 + matching "/usr/bin/icecast2" + start program = "/etc/init.d/icecast2 start" with timeout 10 seconds + stop program = "/etc/init.d/icecast2 stop"