Bug fix: ServerSocket was not set in non-blocking mode, causing the master wait

on the recv() until a ping was sent to it. Now the non-bloking state is defined
in the Connector __init__ to ensure all sockets will not block.


git-svn-id: https://svn.erp5.org/repos/neo/branches/prototype3@1118 71dcc9de-d417-0410-9af5-da40c76e7ee4

neo/connector.py

@@ -53,13 +53,14 @@ class SocketConnector:
             self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         else:
             self.socket = s
+        # always use non-blocking sockets
+        self.socket.setblocking(0)
     
     def makeClientConnection(self, addr):
         self.is_closed = False
         self.remote_addr = addr
         try:
             try:
-                self.socket.setblocking(0)
                 self.socket.connect(addr)
             except socket.error, (err, errmsg):
                 if err == errno.EINPROGRESS:
@@ -76,7 +77,6 @@ class SocketConnector:
         self.is_closed = False
         self.is_listening = True
         try:
-            self.socket.setblocking(0)
             self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
             self.socket.bind(addr)
             self.socket.listen(5)