+hang until sig

satella/instrumentation/instrument.py

@@ -4,13 +4,9 @@ import six
 import logging
 import warnings
 from satella.coding import Monitor, typed
-from .metrics import Metric
+from .metrics import Metric, DISABLED, RUNTIME, DEBUG
 logger = logging.getLogger(__name__)
 
-# Detail levels
-DISABLED = 0
-RUNTIME = 1
-DEBUG = 2
 
 
 

satella/instrumentation/metrics.py

@@ -9,6 +9,10 @@ logger = logging.getLogger(__name__)
 
 from satella.coding import typed
 
+# Detail levels
+DISABLED = 0
+RUNTIME = 1
+DEBUG = 2
 
 class Metric(object):
     """

satella/posix/signals.py

@@ -27,6 +27,7 @@ def hang_until_sig(extra_signals=[]):
             else:
                 logger.warning('Received signal %s', sigq)
                 me_lock.release()
+        return o
 
     for s in extra_signals + [signal.SIGTERM, signal.SIGINT]:
         signal.signal(s, insignum(s))
@@ -34,5 +35,6 @@ def hang_until_sig(extra_signals=[]):
     while True:
         try:
             me_lock.acquire()
+            return
         except InterruptedError:
             pass

setup.py

@@ -2,7 +2,7 @@
 from setuptools import setup, find_packages
 
 setup(name='satella',
-      version='2.0.2a1',
+      version='2.0.3',
       description=u'Utilities for writing servers in Python',
       author=u'Piotr Maślanka',
       author_email='piotrm@smok.co',

tests/test_posix/__init__.py

@@ -2,12 +2,34 @@
 from __future__ import print_function, absolute_import, division
 
 import sys
+import six
 import unittest
+import time
+import threading
 
 from mock import patch, Mock
 import os
 
 
+class TestHUS(unittest.TestCase):
+
+    @patch('signal.signal')
+    def test_signal(self, signal):
+
+        class Delayer(threading.Thread):
+            def run(self):
+                time.sleep(2)
+                for signame, handler in signal.call_args_list:
+                    print(handler)
+                    handler(signame, None)
+
+        from satella.posix import hang_until_sig
+
+        #Delayer().start()
+        hang_until_sig()
+        print(signal.call_args_list)
+
+
 class TestPidlock(unittest.TestCase):
 
     def test_pidlock(self):