default signal fix

dmelikyan · dmelikyan · commit 31341d3e2902 · 2017-06-29T12:09:34.000+02:00
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name = 'stackimpact',
-    version = '1.0.1',
+    version = '1.0.2',
     description = 'StackImpact Python Agent',
     author = 'StackImpact',
     author_email = 'devops@stackimpact.com',
diff --git a/stackimpact/agent.py b/stackimpact/agent.py
@@ -26,7 +26,7 @@
 
 class Agent:
 
-    AGENT_VERSION = "1.0.1"
+    AGENT_VERSION = "1.0.2"
     SAAS_DASHBOARD_ADDRESS = "https://agent-api.stackimpact.com"
 
     def __init__(self, **kwargs):
@@ -128,10 +128,10 @@ def _exit_handler(*arg):
 
         atexit.register(_exit_handler)
 
-        register_signal(signal.SIGQUIT, _exit_handler)
-        register_signal(signal.SIGINT, _exit_handler)
-        register_signal(signal.SIGTERM, _exit_handler)
-        register_signal(signal.SIGHUP, _exit_handler)
+        register_signal(signal.SIGQUIT, _exit_handler, ignore_default = False)
+        register_signal(signal.SIGINT, _exit_handler, ignore_default = False)
+        register_signal(signal.SIGTERM, _exit_handler, ignore_default = False)
+        register_signal(signal.SIGHUP, _exit_handler, ignore_default = False)
 
         self.agent_started = True
         self.log('Agent started')
diff --git a/stackimpact/runtime.py b/stackimpact/runtime.py
@@ -120,15 +120,18 @@ def unpatch(obj, func_name):
     setattr(obj, func_name, getattr(wrapper, '__stackimpact_orig__'))
 
 
-def register_signal(signal_number, handler_func):
-    prev_handler = signal.SIG_IGN
+def register_signal(signal_number, handler_func, ignore_default = True):
+    prev_handler = None
+
     def _handler(signum, frame):
         skip_prev = handler_func(signum, frame)
 
-        if not skip_prev and prev_handler not in [signal.SIG_IGN, signal.SIG_DFL] and callable(prev_handler):
-            prev_handler(signum, frame)
-
-    prev_handler = signal.signal(signal_number, signal.SIG_IGN)
-    if prev_handler != signal.SIG_IGN:
-        signal.signal(signal_number, _handler)
+        if not skip_prev:
+            if callable(prev_handler):
+                prev_handler(signum, frame)
+            elif prev_handler == signal.SIG_DFL and not ignore_default:
+                signal.signal(signum, signal.SIG_DFL)
+                os.kill(os.getpid(), signum)
 
+    prev_handler = signal.signal(signal_number, _handler)
+    
