Merge pull request #49 from smok-serwis/develop

1.2.7
smok-serwis · Jul 9, 2020 · a34869b · a34869b
2 parents ab818cc + f1ed148
commit a34869b
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 6 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -7,3 +7,5 @@ omit=
   stress_tests/*
   coolamqp/framing/definitions.py
   compile_definitions/*
+  setup.py
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,8 +2,6 @@ The changelog is kept as [release notes](https://github.com/smok-serwis/coolamqp
 on GitHub. This file serves to only note what changes
 have been made so far, between releases.
 
-# v1.2.6
-
-* repr improved for methods that were received from the server and had memoryview's in them
-* is far more friendly on Windows, which doesn't have epoll
+# v1.2.7
 
+* fixed queue being defined as a different one in consumer if it was anonymous
diff --git a/coolamqp/__init__.py b/coolamqp/__init__.py
@@ -1 +1 @@
-__version__ = '1.2.6'
+__version__ = '1.2.7'
diff --git a/coolamqp/attaches/consumer.py b/coolamqp/attaches/consumer.py
@@ -403,7 +403,7 @@ def on_setup(self, payload):  # type: (coolamqp.framing.base.AMQPMethodPayload)
 
         elif isinstance(payload, QueueDeclareOk):
             # did we need an anonymous name?
-            if self.queue.anonymous:
+            if not self.queue.name:
                 self.queue.name = payload.queue.tobytes()
 
             queue_declared = False

diff --git a/coolamqp/attaches/declarer.py b/coolamqp/attaches/declarer.py
@@ -140,6 +140,7 @@ def _callback(self, payload):
         else:
             if isinstance(payload, QueueDeclareOk) and self.obj.anonymous:
                 self.obj.name = payload.queue
+                self.obj.anonymous = False
 
             self.span_finished()
             if self.fut is not None:

diff --git a/docs/coolamqp/cluster.rst b/docs/coolamqp/cluster.rst
@@ -0,0 +1,5 @@
+CoolAMQP cluster
+================
+
+.. autoclass:: coolamqp.clustering.Cluster
+    :members:
diff --git a/docs/index.rst b/docs/index.rst
@@ -5,6 +5,7 @@ Welcome to CoolAMQP's documentation!
     :maxdepth: 2
     :caption: Contents
 
+    coolamqp/cluster
     tutorial
     caveats
     frames