Fix to overly optimistic service reporting

This commit is contained in:
Duncan Sommerville 2015-01-19 17:40:21 -05:00
parent 905981114f
commit a0193f6d39
1 changed files with 3 additions and 3 deletions

View File

@ -124,7 +124,7 @@ function checkRMQConnection() {
* @return boolean true if airtime-media-monitor is running * @return boolean true if airtime-media-monitor is running
*/ */
function checkMediaMonitorService() { function checkMediaMonitorService() {
exec("pgrep -f media-monitor", $out, $status); exec("pgrep -fx 'python /usr/lib/airtime/media-monitor/media_monitor.py'", $out, $status);
return $status == 0; return $status == 0;
} }
@ -134,7 +134,7 @@ function checkMediaMonitorService() {
* @return boolean true if airtime-playout is running * @return boolean true if airtime-playout is running
*/ */
function checkPlayoutService() { function checkPlayoutService() {
exec("pgrep -f pypocli", $out, $status); exec("pgrep -fx 'python /usr/lib/airtime/pypo/bin/pypocli.py'", $out, $status);
return $status == 0; return $status == 0;
} }
@ -144,6 +144,6 @@ function checkPlayoutService() {
* @return boolean true if airtime-liquidsoap is running * @return boolean true if airtime-liquidsoap is running
*/ */
function checkLiquidsoapService() { function checkLiquidsoapService() {
exec("pgrep -f liquidsoap", $out, $status); exec("pgrep -fx '/usr/bin/airtime-liquidsoap --verbose -f /usr/lib/airtime/pypo/bin/liquidsoap_scripts/ls_script.liq'", $out, $status);
return $status == 0; return $status == 0;
} }