Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch '2.3.x' into 2.3.x-saas

Browse source
This commit is contained in:
Martin Konecny 2013-03-22 14:24:12 -04:00
commit 00475275e5
7 changed files with 98 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

4
python_apps/pypo/airtime-liquidsoap-init-d
View file

@ -24,10 +24,12 @@ start () {
stop () {
monit unmonitor airtime-liquidsoap >/dev/null 2>&1
#send term signal after 10 seconds
timeout 10 /usr/lib/airtime/airtime_virtualenv/bin/python /usr/lib/airtime/pypo/bin/liquidsoap_scripts/liquidsoap_prepare_terminate.py
timeout -k 5 10 /usr/lib/airtime/airtime_virtualenv/bin/python \
/usr/lib/airtime/pypo/bin/liquidsoap_scripts/liquidsoap_prepare_terminate.py
# Send TERM after 5 seconds, wait at most 30 seconds.
start-stop-daemon --stop --oknodo --retry=TERM/10/KILL/5 --quiet --pidfile $PIDFILE
rm -f $PIDFILE
sleep 3
}
start_no_monit() {

2
python_apps/pypo/pypofetch.py
View file

@ -534,7 +534,7 @@ class PypoFetch(Thread):
#check if this file is opened (sometimes Liquidsoap is still
#playing the file due to our knowledge of the track length
#being incorrect!)
if not self.is_file_opened():
if not self.is_file_opened(path):
os.remove(path)
except Exception, e:
self.logger.error(e)