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

CC-4993: airtime-check-system reports airtime-liquidsoap as down

Browse source 
-fixed
This commit is contained in:
Martin Konecny 2013-03-06 13:41:24 -05:00
parent 8e314477c7
commit 7ca178295f
7 changed files with 11 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/controllers/ApiController.php
View file

@ -696,7 +696,6 @@ class ApiController extends Zend_Controller_Action
"platform"=>Application_Model_Systemstatus::GetPlatformInfo(),
"airtime_version"=>Application_Model_Preference::GetAirtimeVersion(),
"services"=>array(
"rabbitmq"=>Application_Model_Systemstatus::GetRabbitMqStatus(),
"pypo"=>Application_Model_Systemstatus::GetPypoStatus(),
"liquidsoap"=>Application_Model_Systemstatus::GetLiquidsoapStatus(),
"media_monitor"=>Application_Model_Systemstatus::GetMediaMonitorStatus()
@ -994,7 +993,6 @@ class ApiController extends Zend_Controller_Action
$request = $this->getRequest();
$data = $request->getParam("data");
$media_id = $request->getParam("media_id");
$data_arr = json_decode($data);
if (!is_null($media_id)) {

1
airtime_mvc/application/controllers/SystemstatusController.php
View file

@ -17,7 +17,6 @@ class SystemstatusController extends Zend_Controller_Action
"pypo"=>Application_Model_Systemstatus::GetPypoStatus(),
"liquidsoap"=>Application_Model_Systemstatus::GetLiquidsoapStatus(),
"media-monitor"=>Application_Model_Systemstatus::GetMediaMonitorStatus(),
"rabbitmq-server"=>Application_Model_Systemstatus::GetRabbitMqStatus()
);
$partitions = Application_Model_Systemstatus::GetDiskInfo();

2
install_minimal/airtime-install
View file

@ -213,7 +213,7 @@ touch /usr/share/airtime/public/index.php
if [ "$python_service" -eq "0" ]; then
#only run airtime-check-system if all components were installed
echo -e "\n*** Verifying your system environment, running airtime-check-system ***"
sleep 15
sleep 10
set +e
airtime-check-system --no-color

1
install_minimal/include/airtime-uninitialize.sh
View file

@ -19,7 +19,6 @@ set +e
monit unmonitor airtime-media-monitor >/dev/null 2>&1
monit unmonitor airtime-liquidsoap >/dev/null 2>&1
monit unmonitor airtime-playout >/dev/null 2>&1
monit unmonitor rabbitmq-server
set -e
#virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"

19
python_apps/pypo/airtime-liquidsoap-init-d
View file

@ -17,15 +17,7 @@ DAEMON=/usr/lib/airtime/pypo/bin/airtime-liquidsoap
PIDFILE=/var/run/airtime-liquidsoap.pid
start () {
chown pypo:pypo /var/log/airtime/pypo
chown pypo:pypo /var/log/airtime/pypo-liquidsoap
touch /var/run/airtime-liquidsoap.pid
chown pypo:pypo /var/run/airtime-liquidsoap.pid
start-stop-daemon --start --quiet --chuid $USERID:$GROUPID \
--pidfile /var/run/airtime-liquidsoap.pid --nicelevel -15 --startas $DAEMON
start_no_monit
monit monitor airtime-liquidsoap >/dev/null 2>&1
}
@ -39,7 +31,14 @@ stop () {
}
start_no_monit() {
start-stop-daemon --start --background --quiet --chuid $USERID:$USERID --make-pidfile --pidfile $PIDFILE --startas $DAEMON
chown pypo:pypo /var/log/airtime/pypo
chown pypo:pypo /var/log/airtime/pypo-liquidsoap
touch /var/run/airtime-liquidsoap.pid
chown pypo:pypo /var/run/airtime-liquidsoap.pid
start-stop-daemon --start --quiet --chuid $USERID:$GROUPID \
--pidfile /var/run/airtime-liquidsoap.pid --nicelevel -15 --startas $DAEMON
}

2
python_apps/pypo/monit-airtime-liquidsoap.cfg
View file

@ -12,5 +12,5 @@
if failed host localhost port 1234
send "version\r\nexit\r\n"
expect "Liquidsoap"
retry 3
with timeout 2 seconds retry 3 for 2 cycles
then restart

11
utils/airtime-check-system.php
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){