openstack/oslo.messaging
Code Issues Proposed changes

Merge "Avoid creating qpid connection twice in initialization"

Browse Source
This commit is contained in:
Jenkins 2013-12-09 18:24:06 +00:00 committed by Gerrit Code Review
commit 77c319d9a9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
oslo/messaging/_drivers/impl_qpid.py
View File

@ -441,6 +441,7 @@ class Connection(object):
if not qpid_messaging:
raise ImportError("Failed to import qpid.messaging")
self.connection = None
self.session = None
self.consumers = {}
self.consumer_thread = None
@ -464,7 +465,6 @@ class Connection(object):
self.brokers = params['qpid_hosts']
self.username = params['username']
self.password = params['password']
self.connection_create(self.brokers[0])
self.reconnect()
def connection_create(self, broker):
@ -495,7 +495,7 @@ class Connection(object):
delay = 1
while True:
# Close the session if necessary
if self.connection.opened():
if self.connection is not None and self.connection.opened():
try:
self.connection.close()
except qpid_exceptions.ConnectionError: