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

Last updates before 2.5.2 RC, mainly small fixes for Ubuntu Precise

Browse source
This commit is contained in:
Duncan Sommerville 2015-01-19 15:05:13 -05:00
parent 2cb26db84b
commit c5a60d2f09
6 changed files with 28 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/application/configs/config-check.php
View file

@ -191,7 +191,7 @@ $result = $r1 && $r2;
?>">
Check that the airtime-playout service is installed correctly in <code>/etc/init</code>,
and ensure that it's running with
<br/><code>sudo initctl list | grep airtime-playout</code><br/>
<br/><code>initctl list | grep airtime-playout</code><br/>
If not, try <br/><code>sudo service airtime-playout restart</code>
<?php
}
@ -211,7 +211,7 @@ $result = $r1 && $r2;
?>">
Check that the airtime-liquidsoap service is installed correctly in <code>/etc/init</code>,
and ensure that it's running with
<br/><code>sudo initctl list | grep airtime-liquidsoap</code><br/>
<br/><code>initctl list | grep airtime-liquidsoap</code><br/>
If not, try <br/><code>sudo service airtime-liquidsoap restart</code>
<?php
}

4
airtime_mvc/application/views/scripts/systemstatus/index.phtml
View file

@ -144,7 +144,7 @@
?>">
Check that the airtime-playout service is installed correctly in <code>/etc/init</code>,
and ensure that it's running with
<br/><code>sudo initctl list | grep airtime-playout</code><br/>
<br/><code>initctl list | grep airtime-playout</code><br/>
If not, try <br/><code>sudo service airtime-playout restart</code>
<?php
}
@ -164,7 +164,7 @@
?>">
Check that the airtime-liquidsoap service is installed correctly in <code>/etc/init</code>,
and ensure that it's running with
<br/><code>sudo initctl list | grep airtime-liquidsoap</code><br/>
<br/><code>initctl list | grep airtime-liquidsoap</code><br/>
If not, try <br/><code>sudo service airtime-liquidsoap restart</code>
<?php
}

6
airtime_mvc/build/airtime-setup/load.php
View file

@ -124,7 +124,7 @@ function checkRMQConnection() {
* @return boolean true if airtime-media-monitor is running
*/
function checkMediaMonitorService() {
exec("service airtime-media-monitor status | grep start", $out, $status);
exec("pgrep -f media-monitor", $out, $status);
return $status == 0;
}
@ -134,7 +134,7 @@ function checkMediaMonitorService() {
* @return boolean true if airtime-playout is running
*/
function checkPlayoutService() {
exec("service airtime-playout status | grep start", $out, $status);
exec("pgrep -f pypocli", $out, $status);
return $status == 0;
}
@ -144,6 +144,6 @@ function checkPlayoutService() {
* @return boolean true if airtime-liquidsoap is running
*/
function checkLiquidsoapService() {
exec("service airtime-liquidsoap status | grep start", $out, $status);
exec("pgrep -f liquidsoap", $out, $status);
return $status == 0;
}