Merge branch '2.5.x' into cc-5709-airtime-analyzer

This commit is contained in:
drigato 2014-11-03 10:29:53 -05:00
commit 52b0db5ccd
6 changed files with 1040 additions and 113 deletions

View file

@ -191,7 +191,7 @@ class PypoFetch(Thread):
self.logger.info("Restarting Liquidsoap")
subprocess.call('/etc/init.d/airtime-liquidsoap restart', shell=True)
subprocess.call('/etc/init.d/airtime-liquidsoap restart', shell=True, close_fds=True)
#Wait here and poll Liquidsoap until it has started up
self.logger.info("Waiting for Liquidsoap to start")