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

use proper parameters for earlier versions of 'timeout' command 

-lucid has timeout with incompatible parameters compared to newer
versions of ubuntu.
This commit is contained in:
Martin Konecny 2013-05-28 16:18:29 -04:00
parent 4c3d2b20db
commit a4ca2deb0f
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
python_apps/pypo/airtime-liquidsoap-init-d
View File

@ -18,7 +18,6 @@ PIDFILE=/var/run/airtime-liquidsoap.pid
EXEC='/usr/bin/airtime-liquidsoap' EXEC='/usr/bin/airtime-liquidsoap'
start () { start () {
mkdir -p /var/log/airtime/pypo-liquidsoap mkdir -p /var/log/airtime/pypo-liquidsoap
chown $USERID:$GROUPID /var/log/airtime/pypo-liquidsoap chown $USERID:$GROUPID /var/log/airtime/pypo-liquidsoap
@ -37,8 +36,17 @@ start () {
stop () { stop () {
#send term signal after 10 seconds #send term signal after 10 seconds
timeout -s9 10s /usr/lib/airtime/airtime_virtualenv/bin/python \ timeout --version
/usr/lib/airtime/pypo/bin/liquidsoap_scripts/liquidsoap_prepare_terminate.py $RESULT="$?"
if [ "$RESULT" = "0" ]; then
timeout -s9 10s /usr/lib/airtime/airtime_virtualenv/bin/python \
/usr/lib/airtime/pypo/bin/liquidsoap_scripts/liquidsoap_prepare_terminate.py
else
#some earlier versions of Ubuntu (Lucid) had a different timeout
#command that takes different input parameters.
timeout 10 /usr/lib/airtime/airtime_virtualenv/bin/python \
/usr/lib/airtime/pypo/bin/liquidsoap_scripts/liquidsoap_prepare_terminate.py
fi
# Send TERM after 5 seconds, wait at most 30 seconds. # Send TERM after 5 seconds, wait at most 30 seconds.
#start-stop-daemon --stop --oknodo --retry=TERM/10/KILL/5 --quiet --pidfile $PIDFILE #start-stop-daemon --stop --oknodo --retry=TERM/10/KILL/5 --quiet --pidfile $PIDFILE
start-stop-daemon --stop --oknodo --retry=TERM/10/KILL/5 --quiet --exec $EXEC start-stop-daemon --stop --oknodo --retry=TERM/10/KILL/5 --quiet --exec $EXEC