Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x

This commit is contained in:
Martin Konecny 2013-04-08 18:53:49 -04:00
parent aca651a1b4 6705669549
commit 5b4bc038b0
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
install_minimal/airtime-install
View File

@ -143,6 +143,11 @@ fi
#We don't want any of our python services running if we are doing an upgrade/reinstall. #We don't want any of our python services running if we are doing an upgrade/reinstall.
#They will be automatically restarted later on. #They will be automatically restarted later on.
echo "* Temporarily stopping any previous running services" echo "* Temporarily stopping any previous running services"
set +e
monit unmonitor airtime-media-monitor >/dev/null 2>&1
monit unmonitor airtime-liquidsoap >/dev/null 2>&1
monit unmonitor airtime-playout >/dev/null 2>&1
set -e
if [ -e /etc/init.d/airtime-media-monitor ]; then if [ -e /etc/init.d/airtime-media-monitor ]; then
invoke-rc.d airtime-media-monitor stop > /dev/null 2>&1 invoke-rc.d airtime-media-monitor stop > /dev/null 2>&1
fi fi

4
install_minimal/include/airtime-uninitialize.sh
View File

@ -21,13 +21,9 @@ monit unmonitor airtime-liquidsoap >/dev/null 2>&1
monit unmonitor airtime-playout >/dev/null 2>&1 monit unmonitor airtime-playout >/dev/null 2>&1
set -e set -e
#virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"
#. ${virtualenv_bin}activate
#uninitialize Airtime services #uninitialize Airtime services
python $AIRTIMEROOT/python_apps/pypo/install/pypo-uninitialize.py python $AIRTIMEROOT/python_apps/pypo/install/pypo-uninitialize.py
python $AIRTIMEROOT/python_apps/media-monitor/install/media-monitor-uninitialize.py python $AIRTIMEROOT/python_apps/media-monitor/install/media-monitor-uninitialize.py
#python $AIRTIMEROOT/python_apps/show-recorder/install/recorder-uninitialize.py
if [ "$purge" = "t" ]; then if [ "$purge" = "t" ]; then
#call Airtime uninstall script #call Airtime uninstall script

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

@ -15,6 +15,7 @@ NAME="Liquidsoap Playout Engine"
DAEMON=/usr/lib/airtime/pypo/bin/airtime-liquidsoap DAEMON=/usr/lib/airtime/pypo/bin/airtime-liquidsoap
PIDFILE=/var/run/airtime-liquidsoap.pid PIDFILE=/var/run/airtime-liquidsoap.pid
EXEC='/usr/bin/airtime-liquidsoap'
start () { start () {
chown pypo:pypo /var/log/airtime/pypo chown pypo:pypo /var/log/airtime/pypo
@ -24,8 +25,10 @@ start () {
touch $PIDFILE touch $PIDFILE
chown pypo:pypo $PIDFILE chown pypo:pypo $PIDFILE
#start-stop-daemon --start --quiet --chuid $USERID:$GROUPID \
#--pidfile $PIDFILE --nicelevel -15 --startas $DAEMON
start-stop-daemon --start --quiet --chuid $USERID:$GROUPID \ start-stop-daemon --start --quiet --chuid $USERID:$GROUPID \
--pidfile $PIDFILE --nicelevel -15 --startas $DAEMON --nicelevel -15 --startas $DAEMON --exec $EXEC
} }
stop () { stop () {
@ -33,9 +36,11 @@ stop () {
timeout -s9 10s /usr/lib/airtime/airtime_virtualenv/bin/python \ timeout -s9 10s /usr/lib/airtime/airtime_virtualenv/bin/python \
/usr/lib/airtime/pypo/bin/liquidsoap_scripts/liquidsoap_prepare_terminate.py /usr/lib/airtime/pypo/bin/liquidsoap_scripts/liquidsoap_prepare_terminate.py
# 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
rm -f $PIDFILE rm -f $PIDFILE
sleep 3 sleep 2
} }
start_with_monit () { start_with_monit () {

3
python_apps/pypo/monit-airtime-liquidsoap.cfg
View File

@ -3,8 +3,7 @@
set httpd port 2812 set httpd port 2812
check process airtime-liquidsoap check process airtime-liquidsoap matching "airtime-liquidsoap.*airtime.*ls_script"
with pidfile "/var/run/airtime-liquidsoap.pid"
start program = "/etc/init.d/airtime-liquidsoap start" with timeout 30 seconds start program = "/etc/init.d/airtime-liquidsoap start" with timeout 30 seconds
stop program = "/etc/init.d/airtime-liquidsoap stop" stop program = "/etc/init.d/airtime-liquidsoap stop"