Commit 63f11ead authored by Grégory Wisniewski's avatar Grégory Wisniewski

Remove unused timeout parameters from _askStorage and _askPrimary.

git-svn-id: https://svn.erp5.org/repos/neo/trunk@1894 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent 1ec573e1
...@@ -225,23 +225,21 @@ class Application(object): ...@@ -225,23 +225,21 @@ class Application(object):
elif packet is not None: elif packet is not None:
self._handlePacket(conn, packet) 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 """ """ Send a request to a storage node and process it's answer """
try: try:
msg_id = conn.ask(self.local_var.queue, packet, timeout, msg_id = conn.ask(self.local_var.queue, packet)
additional_timeout)
finally: finally:
# assume that the connection was already locked # assume that the connection was already locked
conn.unlock() conn.unlock()
self._waitMessage(conn, msg_id, self.storage_handler) 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 """ """ Send a request to the primary master and process it's answer """
conn = self._getMasterConnection() conn = self._getMasterConnection()
conn.lock() conn.lock()
try: try:
msg_id = conn.ask(self.local_var.queue, packet, timeout, msg_id = conn.ask(self.local_var.queue, packet)
additional_timeout)
finally: finally:
conn.unlock() conn.unlock()
self._waitMessage(conn, msg_id, self.primary_handler) self._waitMessage(conn, msg_id, self.primary_handler)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment