Merge remote-tracking branch 'jaredsuttles/poller_close' into close-poller

Author: mnaberez

supervisor/options.py

@@ -1160,6 +1160,7 @@ def cleanup(self):
                     socketname = config['file']
                     self._try_unlink(socketname)
         self._try_unlink(self.pidfile)
+        self.poller.close()
 
     def _try_unlink(self, path):
         try:
@@ -2189,4 +2190,3 @@ class NoPermission(ProcessException):
     """ Indicates that the file cannot be executed because the supervisor
     process does not possess the appropriate UNIX filesystem permission
     to execute the file. """
-

supervisor/poller.py

@@ -28,6 +28,9 @@ def before_daemonize(self):
     def after_daemonize(self):
         pass
 
+    def close(self):
+        pass
+
 
 class SelectPoller(BasePoller):
 
@@ -189,8 +192,7 @@ def poll(self, timeout):
         return readables, writables
 
     def before_daemonize(self):
-        self._kqueue.close()
-        self._kqueue = None
+        self.close()
 
     def after_daemonize(self):
         self._kqueue = select.kqueue()
@@ -199,6 +201,10 @@ def after_daemonize(self):
         for fd in self.writables:
             self.register_writable(fd)
 
+    def close(self):
+        self._kqueue.close()
+        self._kqueue = None
+
 def implements_poll():
     return hasattr(select, 'poll')