Merge branch '2.5.x' into saas

This commit is contained in:
Duncan Sommerville 2014-10-30 17:42:55 -04:00
commit ef9ab1acf0

View file

@ -191,7 +191,7 @@ class PypoFetch(Thread):
self.logger.info("Restarting Liquidsoap") 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 #Wait here and poll Liquidsoap until it has started up
self.logger.info("Waiting for Liquidsoap to start") self.logger.info("Waiting for Liquidsoap to start")