Merge branch 'ryerson-history'

python_apps/pypo/liquidsoap_scripts/ls_script.liq

@@ -41,9 +41,9 @@ source_id = ref 0
 
 def create_source()
     l = request.equeue(id="s#{!source_id}", length=0.5)
-    l = cue_cut(l)
 
     l = audio_to_stereo(id="queue_src", l)
+    l = cue_cut(l)
     l = amplify(1., override="replay_gain", l)
 
     # the crossfade function controls fade in/out
@@ -238,8 +238,7 @@ s = switch(id="schedule_noise_switch",
     )
 
 s = if dj_live_stream_port != 0 and dj_live_stream_mp != "" then
-    dj_live = mksafe(
-        id="dj_live_mksafe",
+    dj_live =
         audio_to_stereo(
             input.harbor(id="live_dj_harbor",
                 dj_live_stream_mp,
@@ -247,7 +246,7 @@ s = if dj_live_stream_port != 0 and dj_live_stream_mp != "" then
                 auth=check_dj_client,
                 max=40.,
                 on_connect=live_dj_connect,
-                on_disconnect=live_dj_disconnect)))
+                on_disconnect=live_dj_disconnect))
 
     ignore(output.dummy(dj_live, fallible=true))
 
@@ -261,8 +260,7 @@ else
 end
 
 s = if master_live_stream_port != 0 and master_live_stream_mp != "" then
-    master_dj = mksafe(
-        id="master_dj_mksafe",
+    master_dj =
         audio_to_stereo(
             input.harbor(id="master_harbor",
                 master_live_stream_mp,
@@ -270,7 +268,7 @@ s = if master_live_stream_port != 0 and master_live_stream_mp != "" then
                 auth=check_master_dj_client,
                 max=40.,
                 on_connect=master_dj_connect,
-                on_disconnect=master_dj_disconnect)))
+                on_disconnect=master_dj_disconnect))
 
     ignore(output.dummy(master_dj, fallible=true))
 

python_apps/pypo/recorder/recorder.py

@@ -10,6 +10,7 @@ import pytz
 import signal
 import math
 import traceback
+import re
 
 from configobj import ConfigObj
 
@@ -17,6 +18,7 @@ from poster.encode import multipart_encode
 from poster.streaminghttp import register_openers
 
 from subprocess import Popen
+from subprocess import PIPE
 from threading import Thread
 
 import mutagen
@@ -93,12 +95,16 @@ class ShowRecorder(Thread):
         self.logger.info("starting record")
         self.logger.info("command " + command)
 
-        self.p = Popen(args)
+        self.p = Popen(args,stdout=PIPE)
 
         #blocks at the following line until the child process
         #quits
         self.p.wait()
-
+        outmsgs = self.p.stdout.readlines()
+        for msg in outmsgs:
+            m = re.search('^ERROR',msg)
+            if not m == None:
+                self.logger.info('Recording error is found: %s', msg)
         self.logger.info("finishing record, return code %s", self.p.returncode)
         code = self.p.returncode
 

python_apps/pypo/schedule/pypofetch.py

@@ -217,7 +217,8 @@ class PypoFetch(Thread):
         except Exception, e:
             self.logger.error(e)
         finally:
-            self.telnet_lock.release()
+            if self.telnet_lock.locked():
+                self.telnet_lock.release()
 
     """
     TODO: This function needs to be way shorter, and refactored :/ - MK