summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Giusti <kgiusti@apache.org>2015-10-02 19:58:57 +0000
committerKen Giusti <kgiusti@apache.org>2015-10-02 19:58:57 +0000
commita8fc7e4dcaa8ecdda8c3b009e2e0766cb4189a7d (patch)
tree505846b8fd6d0b26771e5cdc4f927f84f32bcbfb
parent2d9f712ce551026f0d5f302aaa0e0b85aea8747c (diff)
downloadqpid-python-a8fc7e4dcaa8ecdda8c3b009e2e0766cb4189a7d.tar.gz
QPID-6767: allow 'service' key in connection parameters.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1706484 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/extras/qmf/src/py/qmf/console.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/qpid/extras/qmf/src/py/qmf/console.py b/qpid/extras/qmf/src/py/qmf/console.py
index 67abf351d0..405c5dcb62 100644
--- a/qpid/extras/qmf/src/py/qmf/console.py
+++ b/qpid/extras/qmf/src/py/qmf/console.py
@@ -2408,8 +2408,10 @@ class Broker(Thread):
connSock = ssl(sock, certfile=certfile, keyfile=keyfile)
else:
connSock = sock
+ if not 'service' in self.connectArgs:
+ self.connectArgs['service'] = 'qpidd'
self.conn = Connection(connSock, username=self.authUser, password=self.authPass,
- mechanism = self.mechanisms, host=self.host, service="qpidd",
+ mechanism = self.mechanisms, host=self.host,
**self.connectArgs)
def aborted():
raise Timeout("Waiting for connection to be established with broker")