Merge branch '2.3.x' into devel

This commit is contained in:
Martin Konecny 2013-03-22 14:24:37 -04:00
commit 2fc1612460
1 changed files with 3 additions and 2 deletions

View File

@ -24,11 +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 4
sleep 3
}
start_no_monit() {