diff --git a/.coveragerc b/.coveragerc index e07fda6d9b68ba189a8e1a0139c310501088faca..43c16e60e35c41fc60d6f3f9f72bac6a08e3c601 100644 --- 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 index f83f60724664a9e0a10c2258f53776031b449288..55eef87bc329b12afb89fb3cfb17cacd5fb66baa 100644 --- 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 index 593fb6f6b1f88f85de741af87e4f986d73c108f9..af391e6b955eae832cbf4c7dc12b31a7f7d22640 100644 --- 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 index 24214acfe51bc0000fed291d9437cf5d2d50a262..d5f0c141052b3859f73a8652f1e41334f6818470 100644 --- a/coolamqp/attaches/consumer.py +++ b/coolamqp/attaches/consumer.py @@ -403,7 +403,7 @@ class Consumer(Channeler): 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 index 94289a3a1e846845543a2c2c57b97ad7e211bd73..ace6b99fc5c53ab3d4e04a7aab093c88656caddc 100644 --- a/coolamqp/attaches/declarer.py +++ b/coolamqp/attaches/declarer.py @@ -140,6 +140,7 @@ class Operation(object): 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 new file mode 100644 index 0000000000000000000000000000000000000000..73af6b09b9c335a3b4950ad54337ec1234f97e83 --- /dev/null +++ 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 index 8c37645d7214e475f619cdc7eff8109f5546324f..0a6c28ad192d51286a29d9987c75e2d708dadfab 100644 --- 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