Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

python_apps/media-monitor/airtime-media-monitor-init-d

@@ -28,6 +28,10 @@ stop () {
         rm -f $PIDFILE
 }
 
+start_no_monit() {
+    start-stop-daemon --start --background --quiet --chuid $USERID:$GROUPID --make-pidfile --pidfile $PIDFILE --startas $DAEMON
+}
+
 
 case "${1:-''}" in
   'start')
@@ -49,6 +53,12 @@ case "${1:-''}" in
            start
            echo "Done."
         ;;
+  'start-no-monit')
+           # restart commands here
+           echo -n "Starting $NAME: "
+           start_no_monit
+           echo "Done."
+        ;;
   'status')
            # status commands here
            /usr/bin/airtime-check-system

python_apps/media-monitor/install/media-monitor-install.py

@@ -39,6 +39,10 @@ def get_current_script_dir():
   index = current_script_dir.rindex('/')
   return current_script_dir[0:index]
 
+def copy_monit_file(current_script_dir):
+    shutil.copy("%s/../monit-airtime-media-monitor.cfg"%current_script_dir, "/etc/monit/conf.d/")
+    shutil.copy("%s/../../monit/monit-airtime-generic.cfg"%current_script_dir, "/etc/monit/conf.d/")
+
 
 try:
   # load config file
@@ -50,6 +54,8 @@ try:
 
   current_script_dir = get_current_script_dir()
 
+  copy_monit_file(current_script_dir)
+
   p = Popen("/etc/init.d/airtime-media-monitor stop >/dev/null 2>&1", shell=True)
   sts = os.waitpid(p.pid, 0)[1]
 
@@ -72,7 +78,7 @@ try:
   sts = os.waitpid(p.pid, 0)[1]
 
   print "Waiting for processes to start..."
-  p = Popen("/etc/init.d/airtime-media-monitor start", shell=True)
+  p = Popen("/etc/init.d/airtime-media-monitor start-no-monit", shell=True)
   sts = os.waitpid(p.pid, 0)[1]
 
 except Exception, e:

python_apps/media-monitor/install/media-monitor-uninstall.py

@@ -18,6 +18,9 @@ def get_current_script_dir():
   index = current_script_dir.rindex('/')
   return current_script_dir[0:index]
 
+def remove_monit_file():
+    os.system("rm -f /etc/monit/conf.d/monit-airtime-media-monitor.cfg")
+
 try:
     # load config file
     try:
@@ -30,6 +33,9 @@ try:
     os.system("rm -f /etc/init.d/airtime-media-monitor")
     os.system("update-rc.d -f airtime-media-monitor remove >/dev/null 2>&1")
 
+    print "Removing monit file"
+    remove_monit_file()
+
     print "Removing log directories"
     remove_path(config["log_dir"])
 

python_apps/media-monitor/monit-airtime-media-monitor.cfg

@@ -0,0 +1,9 @@
+ set daemon 10 # Poll at 5 second intervals
+ set logfile /var/log/monit.log
+
+ set httpd port 2812
+
+ 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"