recompiled apps with new notifications on quit

Security Growler Light.app/Contents/Resources/growler.py

@@ -3,12 +3,14 @@
 # Nick Sweeting (github.com/pirate) 2016
 # MIT License
 
+import signal
 import traceback
 
 from sources import get_new_lines
 from parsers import parse_line, get_sources_info
 from loggers import notify, alert
 
+
 def watch_sources():
     """runloop to parse events from sources and dispatch alerts"""
     sources_info = '\n' + get_sources_info()
@@ -27,10 +29,21 @@ def watch_sources():
         if alert_type == 'alert':
             alert(content, title)
 
+
+def quit_handler(signo, _stack_frame=None):
+    notify('Quit by user: got signal #%s' % signo, title='Stopped Watching Sources')
+    raise SystemExit(0)
+
+
 if __name__ == "__main__":
+    signal.signal(signal.SIGTERM, quit_handler)
     try:
         watch_sources()
+    except KeyboardInterrupt:
+        quit_handler('CTRL-C')
+    except SystemExit:
+        raise
     except BaseException as e:
-        notify(type(e).__name__, 'Stopped Watching Sources')
-        if isinstance(e, Exception):
-            traceback.print_exc()
+        # notify user protection has stopped at all costs, even if error is a SyntaxError
+        notify(traceback.format_exc(), title='Stopped Watching Sources: %s' % type(e).__name__)
+        raise

Security Growler.app/Contents/Resources/growler.py

@@ -3,12 +3,14 @@
 # Nick Sweeting (github.com/pirate) 2016
 # MIT License
 
+import signal
 import traceback
 
 from sources import get_new_lines
 from parsers import parse_line, get_sources_info
 from loggers import notify, alert
 
+
 def watch_sources():
     """runloop to parse events from sources and dispatch alerts"""
     sources_info = '\n' + get_sources_info()
@@ -27,10 +29,21 @@ def watch_sources():
         if alert_type == 'alert':
             alert(content, title)
 
+
+def quit_handler(signo, _stack_frame=None):
+    notify('Quit by user: got signal #%s' % signo, title='Stopped Watching Sources')
+    raise SystemExit(0)
+
+
 if __name__ == "__main__":
+    signal.signal(signal.SIGTERM, quit_handler)
     try:
         watch_sources()
+    except KeyboardInterrupt:
+        quit_handler('CTRL-C')
+    except SystemExit:
+        raise
     except BaseException as e:
-        notify(type(e).__name__, 'Stopped Watching Sources')
-        if isinstance(e, Exception):
-            traceback.print_exc()
+        # notify user protection has stopped at all costs, even if error is a SyntaxError
+        notify(traceback.format_exc(), title='Stopped Watching Sources: %s' % type(e).__name__)
+        raise

growler.py

@@ -3,12 +3,14 @@
 # Nick Sweeting (github.com/pirate) 2016
 # MIT License
 
+import signal
 import traceback
 
 from sources import get_new_lines
 from parsers import parse_line, get_sources_info
 from loggers import notify, alert
 
+
 def watch_sources():
     """runloop to parse events from sources and dispatch alerts"""
     sources_info = '\n' + get_sources_info()
@@ -27,12 +29,21 @@ def watch_sources():
         if alert_type == 'alert':
             alert(content, title)
 
+
+def quit_handler(signo, _stack_frame=None):
+    notify('Quit by user: got signal #%s' % signo, title='Stopped Watching Sources')
+    raise SystemExit(0)
+
+
 if __name__ == "__main__":
+    signal.signal(signal.SIGTERM, quit_handler)
     try:
         watch_sources()
+    except KeyboardInterrupt:
+        quit_handler('CTRL-C')
+    except SystemExit:
+        raise
     except BaseException as e:
-        if isinstance(e, Exception):
-            notify(traceback.format_exc(), title='Stopped Watching Sources: %s' % type(e).__name__)
-        else:
-            notify('Quit by user: %s' % type(e).__name__, title='Stopped Watching Sources')
+        # notify user protection has stopped at all costs, even if error is a SyntaxError
+        notify(traceback.format_exc(), title='Stopped Watching Sources: %s' % type(e).__name__)
         raise