retry on eint

kuyruk/helpers/__init__.py

@@ -2,6 +2,8 @@
 Contains generic functions/classes that can be used in any project.
 
 """
+import errno
+import select
 import logging
 import threading
 import traceback
@@ -93,3 +95,15 @@ def print_stack(sig, frame):
     print '=' * 70
     print ''.join(traceback.format_stack())
     print '-' * 70
+
+
+def retry_on_eintr(f):
+    @wraps(f)
+    def inner(*args, **kwargs):
+        while True:
+            try:
+                return f(*args, **kwargs)
+            except (select.error, OSError) as e:
+                if e[0] != errno.EINTR:
+                    raise
+    return inner

kuyruk/master.py

@@ -12,7 +12,7 @@
 
 from setproctitle import setproctitle
 
-from kuyruk import __version__
+from kuyruk import __version__, helpers
 from kuyruk.process import KuyrukProcess
 
 
@@ -82,8 +82,9 @@ def wait_for_workers(self):
         If a worker is dead and Kuyruk is running state, spawns a new worker.
 
         """
+        retry_wait = helpers.retry_on_eintr(os.wait)
         while self.workers:
-            pid, status = os.wait()
+            pid, status = retry_wait()
             worker = self.workers[pid]
             if not self.shutdown_pending.is_set():
                 worker.kill_pg()