Fix bug where pypo fails to restart liquidsoap; uncomment adding pypo template files

This commit is contained in:
Duncan Sommerville 2015-06-29 12:20:39 -04:00
parent 133f1b72ca
commit dd2ffd148d
2 changed files with 3 additions and 3 deletions

View File

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

View File

@ -18,8 +18,8 @@ else:
pypo_files.append(os.path.join(root, filename))
data_files = [
# ('/etc/init', ['install/upstart/airtime-playout.conf.template']),
# ('/etc/init', ['install/upstart/airtime-liquidsoap.conf.template']),
('/etc/init', ['install/upstart/airtime-playout.conf.template']),
('/etc/init', ['install/upstart/airtime-liquidsoap.conf.template']),
('/etc/init.d', ['install/sysvinit/airtime-playout']),
('/etc/init.d', ['install/sysvinit/airtime-liquidsoap']),
('/var/log/airtime/pypo', []),