Make Dispatcher.registered locally compute key value from connection, so that...

Make Dispatcher.registered locally compute key value from connection, so that it is easier to change the way key is computed.


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

neo/client/app.py

@@ -108,7 +108,7 @@ class ConnectionPool(object):
             conn.lock()
             try:
                 if not conn.pending() and \
-                        not self.app.dispatcher.registered(id(conn)):
+                        not self.app.dispatcher.registered(conn):
                     del self.connection_dict[conn.getUUID()]
                     conn.close()
                     logging.info('_dropConnections : connection to storage node %s:%d closed', 

neo/client/dispatcher.py

@@ -53,10 +53,11 @@ class Dispatcher(Thread):
         key = (id(conn), msg_id)
         self.message_table[key] = queue
 
-    def registered(self, id):
+    def registered(self, conn):
         """Check if a connection is registered into message table."""
+        searched_id = id(conn)
         for conn_id, msg_id in self.message_table.iterkeys():
-            if id == conn_id:
+            if searched_id == conn_id:
                 return True
         return False