Merge "ensure we set channel in lock"

2017-01-05 02:46:44 +00:00 · 2017-01-05 02:46:44 +00:00 · a1fecbec58
commit a1fecbec58
parent 6809dbe044 1dc575ce5b
1 changed files with 2 additions and 1 deletions
--- a/oslo_messaging/_drivers/impl_rabbit.py
+++ b/oslo_messaging/_drivers/impl_rabbit.py
@ -607,7 +607,8 @@ class Connection(object):
        self._heartbeat_support_log_emitted = False

        # NOTE(sileht): just ensure the connection is setuped at startup
-        self.ensure_connection()
+        with self._connection_lock:
+            self.ensure_connection()

        # NOTE(sileht): if purpose is PURPOSE_LISTEN
        # the consume code does the heartbeat stuff