CC-2721: Pypo doesn't restart when it gets new stream setting

- fixed
This commit is contained in:
James 2011-08-23 11:13:06 -04:00
parent 078aa1d05d
commit 88d3fa73be
3 changed files with 17 additions and 11 deletions

View File

@ -1,5 +1,6 @@
set daemon 10 # Poll at 10 second intervals
set logfile syslog facility log_daemon
#set logfile syslog facility log_daemon
set logfile /var/log/monit.log
set httpd port 2812 and use address 127.0.0.1
allow localhost
@ -7,16 +8,16 @@
check process airtime-playout
with pidfile "/var/run/airtime-playout.pid"
start program = "/etc/init.d/airtime-playout start" with timeout 10 seconds
start program = "/etc/init.d/airtime-playout restart" with timeout 5 seconds
stop program = "/etc/init.d/airtime-playout stop"
check process airtime-liquidsoap
with pidfile "/var/run/airtime-liquidsoap.pid"
start program = "/etc/init.d/airtime-playout start" with timeout 10 seconds
start program = "/etc/init.d/airtime-playout restart" with timeout 5 seconds
stop program = "/etc/init.d/airtime-playout stop"
# check process airtime-media-monitor
# with pidfile "/var/run/airtime-media-monitor.pid"
# start program = "/etc/init.d/airtime-media-monitor start" with timeout 10 seconds
# stop program = "/etc/init.d/airtime-media-monitor stop"
check process airtime-media-monitor
with pidfile "/var/run/airtime-media-monitor.pid"
start program = "/etc/init.d/airtime-media-monitor start" with timeout 10 seconds
stop program = "/etc/init.d/airtime-media-monitor stop"
check process airtime-show-recorder
with pidfile "/var/run/airtime-show-recorder.pid"
start program = "/etc/init.d/airtime-show-recorder start" with timeout 10 seconds

View File

@ -127,15 +127,19 @@ if __name__ == '__main__':
q = Queue()
pp = PypoPush(q)
pp.daemon = True
pp.start()
pf = PypoFetch(q)
pf.daemon = True
pf.start()
while True: time.sleep(3600)
#while True: time.sleep(3600)
#pp.join()
#pf.join()
pf.join()
logger.info("pypo fetch exit")
sys.exit()
"""
if options.check:
try: g.check_schedule()

View File

@ -199,8 +199,9 @@ class PypoFetch(Thread):
# restarting pypo.
# we could just restart liquidsoap but it take more time somehow.
logger.info("Restarting pypo...")
p = Popen("/etc/init.d/airtime-playout restart >/dev/null 2>&1", shell=True)
sts = os.waitpid(p.pid, 0)[1]
#p = Popen("/etc/init.d/airtime-playout restart >/dev/null 2>&1", shell=True)
#sts = os.waitpid(p.pid, 0)[1]
sys.exit()
self.process_schedule(self.schedule_data, "scheduler", False)
else:
logger.info("No change detected in setting...")