Critical bug fix: preventing getting stuck on select() forever at shutdown.

Author: ipartola

debian/changelog

@@ -1,4 +1,11 @@
-loghogd (7) quantal; urgency=high
+loghogd (8) lucid; urgency=high
+
+  * Critical bug fix: preventing getting stuck on select() forever at
+  shutdown.
+
+ -- Igor Partola <igor@activefrequency.com>  Fri, 01 Feb 2013 16:32:18 -0500
+
+loghogd (7) lucid; urgency=high
 
   * Critical bug fix: buffer overfill caused exception in the server module.
 

loghogd/server.py

@@ -78,6 +78,8 @@ def __init__(self, callback, conf_root, listen_ipv4=None, listen_ipv6=None, defa
 
         self.client_socket_addrs = {}
 
+        self.select_timeout = None # Set on shutdown to prevent infinite wait
+
         self.pemfile = normalize_path(pemfile if pemfile is not None else options.server.pemfile, conf_root)
         self.cacert = normalize_path(cacert if cacert is not None else options.server.cacert, conf_root)
 
@@ -171,17 +173,16 @@ def run(self):
 
         while True:
             try:
-                r, w, e = select.select(self.all_socks, [], self.all_socks)
+                if self.select_timeout:
+                    r, w, _ = select.select(self.all_socks, [], [], self.select_timeout)
+                else:
+                    r, w, _ = select.select(self.all_socks, [], [])
             except Exception as exc:
                 if isinstance(exc, select.error) and exc.args[0] == 4:
                     continue # Got signal, probably HUP
                 else:
                     raise
 
-            for sock in e:
-                # Disconnect error streams
-                self.disconnect_client_stream(sock)
-
             for sock in r:
                 if sock in self.dgram_socks:
                     # Receive datagram
@@ -298,15 +299,16 @@ def close(self):
         for sock in self.client_stream_socks:
             sock.shutdown(socket.SHUT_RDWR)
 
-        time.sleep(self.SHUTDOWN_TIMEOUT)
+        if self.client_stream_socks:
+            time.sleep(self.SHUTDOWN_TIMEOUT)
 
         for sock in self.all_socks:
             sock.close()
 
-
     def shutdown(self):
         '''Notifies the server of a shutdown condition.'''
 
         self.closed = True
+        self.select_timeout = self.SHUTDOWN_TIMEOUT
 
 

loghogd/version.py

@@ -1,2 +1,2 @@
 
-__version__ = '7'
+__version__ = '8'