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

don't change monit monitor state on service start/stop

Browse source
This commit is contained in:
Martin Konecny 2013-04-01 19:31:13 -04:00
parent 254dbafd1b
commit 0bb7fa4975
5 changed files with 77 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

25
python_apps/media-monitor/airtime-media-monitor-init-d
View file

@ -17,19 +17,24 @@ DAEMON=/usr/lib/airtime/media-monitor/airtime-media-monitor
PIDFILE=/var/run/airtime-media-monitor.pid
start () {
start-stop-daemon --start --background --quiet --chuid $USERID:$GROUPID --make-pidfile --pidfile $PIDFILE --startas $DAEMON
monit monitor airtime-media-monitor >/dev/null 2>&1
start-stop-daemon --start --background --quiet --chuid $USERID:$GROUPID \
--make-pidfile --pidfile $PIDFILE --startas $DAEMON
}
stop () {
# Send TERM after 5 seconds, wait at most 30 seconds.
monit unmonitor airtime-media-monitor >/dev/null 2>&1
start-stop-daemon --stop --oknodo --retry TERM/5/0/30 --quiet --pidfile $PIDFILE
rm -f $PIDFILE
}
start_no_monit() {
start-stop-daemon --start --background --quiet --chuid $USERID:$GROUPID --make-pidfile --pidfile $PIDFILE --startas $DAEMON
start_with_monit() {
start
monit monitor airtime-media-monitor >/dev/null 2>&1
}
stop_with_monit() {
monit unmonitor airtime-media-monitor >/dev/null 2>&1
stop
}
@ -53,10 +58,16 @@ case "${1:-''}" in
start
echo "Done."
;;
'start-no-monit')
'start-with-monit')
# restart commands here
echo -n "Starting $NAME: "
start_no_monit
start_with_monit
echo "Done."
;;
'stop-with-monit')
# restart commands here
echo -n "Stopping $NAME: "
stop_with_monit
echo "Done."
;;
'status')

2
python_apps/media-monitor/install/media-monitor-initialize.py
View file

@ -16,6 +16,6 @@ try:
#Start media-monitor daemon
if "airtime_service_start" in os.environ and os.environ["airtime_service_start"] == "t":
print "* Waiting for media-monitor processes to start..."
subprocess.call("invoke-rc.d airtime-media-monitor start-no-monit", shell=True)
subprocess.call("invoke-rc.d airtime-media-monitor start", shell=True)
except Exception, e:
print e