You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by jr...@apache.org on 2013/06/25 21:55:23 UTC

svn commit: r1496619 - /qpid/trunk/qpid/extras/qmf/src/py/qmf/console.py

Author: jross
Date: Tue Jun 25 19:55:23 2013
New Revision: 1496619

URL: http://svn.apache.org/r1496619
Log:
QPID-4811: Add control over session timeout; a patch from Ernie Allen

Modified:
    qpid/trunk/qpid/extras/qmf/src/py/qmf/console.py

Modified: qpid/trunk/qpid/extras/qmf/src/py/qmf/console.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/qmf/src/py/qmf/console.py?rev=1496619&r1=1496618&r2=1496619&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/qmf/src/py/qmf/console.py (original)
+++ qpid/trunk/qpid/extras/qmf/src/py/qmf/console.py Tue Jun 25 19:55:23 2013
@@ -641,7 +641,7 @@ class Session:
     return "QMF Console Session Manager (brokers: %d)" % len(self.brokers)
 
 
-  def addBroker(self, target="localhost", timeout=None, mechanisms=None, **connectArgs):
+  def addBroker(self, target="localhost", timeout=None, mechanisms=None, sessTimeout=None, **connectArgs):
     """ Connect to a Qpid broker.  Returns an object of type Broker.
     Will raise an exception if the session is not managing the connection and
     the connection setup to the broker fails.
@@ -651,7 +651,7 @@ class Session:
     else:
       url = BrokerURL(target)
     broker = Broker(self, url.host, url.port, mechanisms, url.authName, url.authPass,
-                    ssl = url.scheme == URL.AMQPS, connTimeout=timeout, **connectArgs)
+                    ssl = url.scheme == URL.AMQPS, connTimeout=timeout, sessTimeout=sessTimeout, **connectArgs)
 
     self.brokers.append(broker)
     return broker
@@ -2241,7 +2241,7 @@ class Broker(Thread):
       self.data = data
 
   def __init__(self, session, host, port, authMechs, authUser, authPass,
-               ssl=False, connTimeout=None, **connectArgs):
+               ssl=False, connTimeout=None, sessTimeout=None, **connectArgs):
     """ Create a broker proxy and setup a connection to the broker.  Will raise
     an exception if the connection fails and the session is not configured to
     retry connection setup (manageConnections = False).
@@ -2256,8 +2256,13 @@ class Broker(Thread):
     self.mechanisms = authMechs
     self.ssl = ssl
     if connTimeout is not None:
-	connTimeout = float(connTimeout)
+        connTimeout = float(connTimeout)
     self.connTimeout = connTimeout
+    if sessTimeout is not None:
+        sessTimeout = float(sessTimeout)
+    else:
+        sessTimeout = self.SYNC_TIME
+    self.sessTimeout = sessTimeout
     self.authUser = authUser
     self.authPass = authPass
     self.saslUser = None
@@ -2467,7 +2472,7 @@ class Broker(Thread):
 
       self.replyName = "reply-%s" % self.amqpSessionId
       self.amqpSession = self.conn.session(self.amqpSessionId)
-      self.amqpSession.timeout = self.SYNC_TIME
+      self.amqpSession.timeout = self.sessTimeout
       self.amqpSession.auto_sync = True
       self.amqpSession.queue_declare(queue=self.replyName, exclusive=True, auto_delete=True)
       self.amqpSession.exchange_bind(exchange="amq.direct",



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org