More error proof run and stop scripts. Gracefull shutdown.

Author: 2m

MpdActor.py

@@ -40,3 +40,6 @@ def playByNameFrom(self, name, playFrom):
 
         except mpd.CommandError, e:
             logging.getLogger('zbap').error('Exception: %s' % e.message)
+
+    def pause(self):
+        self.client.pause()

WebActor.py

@@ -1,4 +1,4 @@
-import pykka, web 
+import pykka, web, logging
 
 tagActor = None
 
@@ -24,8 +24,11 @@ def runInThread(function):
     t.start()
 
 def runWebApp():
-    app = web.application(urls, globals())
-    app.run()
+    try:
+        app = web.application(urls, globals())
+        app.run()
+    except Exception:
+        logging.getLogger('zbap').info('Shutting down web server.')
 
 class WebActor(pykka.ThreadingActor):
     def __init__(self, tagAct):

Zbap.py

@@ -1,4 +1,4 @@
-import pykka, logging
+import pykka, logging, signal
 
 from time import sleep 
 
@@ -9,8 +9,16 @@
 from NfcActor import NfcActor
 
 sleepSeconds = 0.5
+pleaseContinue = True
 
-if __name__ == "__main__":
+def quitGracefully(*args):
+    global pleaseContinue
+    logging.getLogger('zbap').info('Received SIGINT.')
+    pleaseContinue = False
+
+def run():
+    global pleaseContinue
+    signal.signal(signal.SIGINT, quitGracefully)
 
     logging.basicConfig(filename='zbap.log', format="%(asctime)s [%(module)s.%(funcName)s] %(levelname)s: %(message)s")
     logging.getLogger('pykka').setLevel(logging.DEBUG)
@@ -27,12 +35,18 @@
     stateActor.playFromLastState()
 
     try:
-        while True:
+        while pleaseContinue:
             stateActor.tick()
             nfcActor.tick()
 
             sleep(sleepSeconds)
     except KeyboardInterrupt:
-        print "Exiting main loop."
+        logging.getLogger('zbap').info('Received KeyboardInterrupt.')
+        
+    logging.getLogger('zbap').info('Stopping...')
 
+    mpdActor.pause()
     pykka.ActorRegistry.stop_all()
+    
+if __name__ == "__main__":
+    run()

run.sh

@@ -1,2 +1,12 @@
 #!/bin/bash
+
+CURRENT_PID=`pgrep -f "python Zbap.py"`
+if [ -n "${CURRENT_PID}" ]; then
+    echo "There is already ZBAP running with PID:$CURRENT_PID"
+    exit
+fi
+
+CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+cd $CURRENT_DIR
 python Zbap.py & 

stop.sh

@@ -1,2 +1,7 @@
 #!/bin/bash
-ps a | grep "python Zbap.py" | cut -d" " -f 2 | xargs kill -9
+CURRENT_PID=`pgrep -f "python Zbap.py"`
+if [ -n "${CURRENT_PID}" ]; then
+    kill -SIGINT $CURRENT_PID
+else
+    echo "Zbap is not running."
+fi