Merge remote branch 'rmoore/sbp' into HEAD

* rmoore/sbp:
  Make phenny kill its child threads then exit when it receives a SIGTERM signal.

1 files changed, 5 insertions, 0 deletions

diff --git a/__init__.py b/__init__.py
index 5699583..fa76316 100755
--- a/__init__.py
+++ b/__init__.py
@@ -15,6 +15,7 @@ class Watcher(object):
    def __init__(self):
       self.child = os.fork()
       if self.child != 0: 
+         signal.signal(signal.SIGTERM, self.sig_term)
          self.watch()
 
    def watch(self):
@@ -27,6 +28,10 @@ class Watcher(object):
       try: os.kill(self.child, signal.SIGKILL)
       except OSError: pass
 
+   def sig_term(self, signum, frame):
+      self.kill()
+      sys.exit()
+
 def run_phenny(config): 
    if hasattr(config, 'delay'): 
       delay = config.delay