[Neo-report] r1894 gregory - /trunk/neo/client/app.py

[nobody at svn.erp5.org]

Author: gregory
Date: Fri Mar  5 22:22:57 2010
New Revision: 1894

Log:
Remove unused timeout parameters from _askStorage and _askPrimary.

Modified:
    trunk/neo/client/app.py

Modified: trunk/neo/client/app.py
==============================================================================
--- trunk/neo/client/app.py [iso-8859-1] (original)
+++ trunk/neo/client/app.py [iso-8859-1] Fri Mar  5 22:22:57 2010
@@ -225,23 +225,21 @@
             elif packet is not None:
                 self._handlePacket(conn, packet)
 
-    def _askStorage(self, conn, packet, timeout=5, additional_timeout=30):
+    def _askStorage(self, conn, packet):
         """ Send a request to a storage node and process it's answer """
         try:
-            msg_id = conn.ask(self.local_var.queue, packet, timeout,
-                              additional_timeout)
+            msg_id = conn.ask(self.local_var.queue, packet)
         finally:
             # assume that the connection was already locked
             conn.unlock()
         self._waitMessage(conn, msg_id, self.storage_handler)
 
-    def _askPrimary(self, packet, timeout=5, additional_timeout=30):
+    def _askPrimary(self, packet):
         """ Send a request to the primary master and process it's answer """
         conn = self._getMasterConnection()
         conn.lock()
         try:
-            msg_id = conn.ask(self.local_var.queue, packet, timeout,
-                              additional_timeout)
+            msg_id = conn.ask(self.local_var.queue, packet)
         finally:
             conn.unlock()
         self._waitMessage(conn, msg_id, self.primary_handler)