diff --git a/python_apps/media-monitor/MediaMonitor.py b/python_apps/media-monitor/MediaMonitor.py index 086366b52..172af7f6a 100644 --- a/python_apps/media-monitor/MediaMonitor.py +++ b/python_apps/media-monitor/MediaMonitor.py @@ -18,10 +18,6 @@ def handleSigTERM(signum, frame): p.terminate() logger.info("Killed process. %d", p.pid) - notifier_daemon_pid = open('/var/run/airtime-notifier.pid', 'r').read() - os.kill(int(notifier_daemon_pid), 9) - logger.info("Killed process. %d", int(notifier_daemon_pid)) - sys.exit(0) @@ -65,8 +61,8 @@ try: logger.info("Added watch to %s", storage_directory) logger.info("wdd result %s", wdd[storage_directory]) - notifier.loop(daemonize=True, callback=pe.notifier_loop_callback, pid_file='/var/run/airtime-notifier.pid', stdout='/var/log/airtime/media-monitor/media-monitor.log') - + notifier.loop(callback=pe.notifier_loop_callback) + for p in processes: p.join() diff --git a/python_apps/media-monitor/install/media-monitor-uninstall.py b/python_apps/media-monitor/install/media-monitor-uninstall.py index 97d3bf084..1c102f582 100755 --- a/python_apps/media-monitor/install/media-monitor-uninstall.py +++ b/python_apps/media-monitor/install/media-monitor-uninstall.py @@ -29,7 +29,6 @@ try: os.system("/etc/init.d/airtime-media-monitor stop") os.system("rm -f /etc/init.d/airtime-media-monitor") - os.system("rm -f /var/run/airtime-notifier.pid") os.system("update-rc.d -f airtime-media-monitor remove >/dev/null 2>&1") print "Removing log directories"