Merge branch '2.3.x' into 2.3.x-saas

airtime_mvc/application/Bootstrap.php

@@ -17,15 +17,12 @@ require_once "Timezone.php";
 require_once __DIR__.'/forms/helpers/ValidationTypes.php';
 require_once __DIR__.'/controllers/plugins/RabbitMqPlugin.php';
 
-
-
 date_default_timezone_set('UTC');
 require_once (APPLICATION_PATH."/logging/Logging.php");
 Logging::setLogPath('/var/log/airtime/zendphp.log');
 date_default_timezone_set(Application_Model_Preference::GetTimezone());
 
 Config::setAirtimeVersion();
-$CC_CONFIG = Config::getConfig();
 require_once __DIR__."/configs/navigation.php";
 
 Zend_Validate::setDefaultNamespaces("Zend");

python_apps/media-monitor2/media/monitor/airtime.py

@@ -7,6 +7,7 @@ from os.path          import normpath
 import json
 import os
 import copy
+import time
 
 from media.monitor.exceptions import BadSongFile, InvalidMetadataElement
 from media.monitor.metadata   import Metadata

python_apps/pypo/airtime-liquidsoap

@@ -12,8 +12,6 @@ ls_param="/usr/lib/airtime/pypo/bin/liquidsoap_scripts/ls_script.liq"
 exec 2>&1
 export PYTHONPATH=${api_client_path}
 
-rm -f /etc/airtime/liquidsoap.cfg
-
 cd /usr/lib/airtime/pypo/bin/liquidsoap_scripts
 python generate_liquidsoap_cfg.py
 

python_apps/pypo/airtime-liquidsoap-init-d

@@ -35,12 +35,14 @@ stop () {
 start_no_monit() {
         chown pypo:pypo /var/log/airtime/pypo
         chown pypo:pypo /var/log/airtime/pypo-liquidsoap
+        chown pypo:pypo /etc/airtime/liquidsoap.cfg
 
-        touch /var/run/airtime-liquidsoap.pid
+        rm -f $PIDFILE
-        chown pypo:pypo /var/run/airtime-liquidsoap.pid
+        touch $PIDFILE
+        chown pypo:pypo $PIDFILE 
 
         start-stop-daemon --start --quiet --chuid $USERID:$GROUPID \
-            --pidfile /var/run/airtime-liquidsoap.pid --nicelevel -15 --startas $DAEMON
+            --pidfile $PIDFILE --nicelevel -15 --startas $DAEMON
 }
 
 
@@ -64,8 +66,8 @@ case "${1:-''}" in
         ;;
 
   'status')
-        if [ -f "/var/run/airtime-liquidsoap.pid" ]; then
+        if [ -f "$PIDFILE" ]; then
-            pid=`cat /var/run/airtime-liquidsoap.pid`
+            pid=`cat $PIDFILE`
             if [ -d "/proc/$pid" ]; then
                 echo "Liquidsoap is running"
                 exit 0

python_apps/pypo/media/update/silananalyzer.py

@@ -41,13 +41,17 @@ class SilanAnalyzer(Thread):
                 full_path = f['fp']
                 # silence detect(set default queue in and out)
                 try:
-                    command = ['nice', '-n', '19', 'silan', '-b', '-f', 'JSON', full_path]
-                    proc = subprocess.Popen(command, stdout=subprocess.PIPE)
-                    out = proc.communicate()[0].strip('\r\n')
-                    info = json.loads(out)
                     data = {}
-                    data['cuein'] = str('{0:f}'.format(info['sound'][0][0]))
+                    command = ['nice', '-n', '19', 'silan', '-b', '-f', 'JSON', full_path]
-                    data['cueout'] = str('{0:f}'.format(info['sound'][-1][1]))
+                    try:
+                        proc = subprocess.Popen(command, stdout=subprocess.PIPE)
+                        out = proc.communicate()[0].strip('\r\n')
+                        info = json.loads(out)
+                        data['cuein'] = str('{0:f}'.format(info['sound'][0][0]))
+                        data['cueout'] = str('{0:f}'.format(info['sound'][-1][1]))
+                    except Exception, e:
+                        self.logger.error(str(command))
+                        self.logger.error(e)
                     processed_data.append((f['id'], data))
                     total += 1
                     if total % 5 == 0: