fix respawn

Author: lambdaq

gnsq_mp/master.py

@@ -6,8 +6,8 @@
 from itertools import cycle
 from collections import OrderedDict
 
+from gevent import subprocess, sleep, signal
 from gnsq import Lookupd
-from gevent import subprocess, sleep
 
 from cpu_affinity import ProcessAffinity
 
@@ -70,18 +70,22 @@ def check_worker(self):
                 self._procs[nsqd_tcp_addr] = proc
         self.poll_count += 1
 
+    def kill_all(self):
+        for k, p in self._procs.iteritems():
+            p.send_signal(2)
+            p.wait()
+            print>>sys.stderr, ' [kill] %s pid=%s, rc=%d' % (k, p.pid, p.returncode)
+
     @classmethod
     def run(cls, *args, **kwargs):
         inst = cls(*args, **kwargs)
+        signal(2, inst.kill_all)
         try:
             while 1:
                 inst.check_worker()
                 sleep(3)
         except KeyboardInterrupt:
-            for k, p in inst._procs.iteritems():
-                p.send_signal(2)
-                p.wait()
-                print>>sys.stderr, ' [kill] %s pid=%s, rc=%d' % (k, p.pid, p.returncode)
+            inst.kill_all()
             print>>sys.stderr, ' [exit] all subprocess stopped.'
             exit(0)
         return inst

gnsq_mp/worker.py

@@ -99,7 +99,8 @@ def shutdown(cls, timeout=8):
         # for conn in cls.reader.conns:
         #     conn.close()
         # if cls.reader:
-        spawn(cls.reader.close)
+        if cls.reader:
+            spawn(cls.reader.close)
         sleep(cls._shutdown_timer)
 
 

setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name='gnsq_mp',
-    version="0.2.2",
+    version="0.2.3",
     # packages=find_packages('src'),
     packages=['gnsq_mp'],
     install_requires=[