From dd2ffd148d2d9c88f23a21ccd53e09f137b20ea8 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Mon, 29 Jun 2015 12:20:39 -0400 Subject: [PATCH] Fix bug where pypo fails to restart liquidsoap; uncomment adding pypo template files --- python_apps/pypo/pypo/pypofetch.py | 2 +- python_apps/pypo/setup.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/python_apps/pypo/pypo/pypofetch.py b/python_apps/pypo/pypo/pypofetch.py index 3772e170c..598d2abbc 100644 --- a/python_apps/pypo/pypo/pypofetch.py +++ b/python_apps/pypo/pypo/pypofetch.py @@ -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") diff --git a/python_apps/pypo/setup.py b/python_apps/pypo/setup.py index 3f83fb109..76011e72d 100644 --- a/python_apps/pypo/setup.py +++ b/python_apps/pypo/setup.py @@ -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', []),