Merge pull request #99 from eandersson/bug/97_v2

Handle all channel opening within the lock
eandersson · May 25, 2021 · e8f5c6f · e8f5c6f
2 parents 9cecbd3 + e858db2
commit e8f5c6f
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/amqpstorm/connection.py b/amqpstorm/connection.py
@@ -183,16 +183,20 @@ def channel(self, rpc_timeout=60, lazy=False):
         elif self.is_closed:
             raise AMQPConnectionError('socket/connection closed')
 
-        with self.lock:
+        channel_id = None
+        self.lock.acquire()
+        try:
             channel_id = self._get_next_available_channel_id()
             channel = Channel(channel_id, self, rpc_timeout)
             self._channels[channel_id] = channel
             if not lazy:
                 channel.open()
-
-        channel.on_close_impl = self._cleanup_channel
-        LOGGER.debug('Channel #%d Opened', channel_id)
-        return self._channels[channel_id]
+            channel.on_close_impl = self._cleanup_channel
+            return self._channels[channel_id]
+        finally:
+            self.lock.release()
+            if channel_id is not None:
+                LOGGER.debug('Channel #%d Opened', channel_id)
 
     def check_for_errors(self):
         """Check Connection for errors.