Promoting 2.2.2

eandersson · Apr 23, 2017 · a229ef5 · a229ef5
1 parent 477825c
commit a229ef5
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,6 +11,7 @@ python:
   - 3.7-dev
   - nightly
   - pypy
+  - pypy3
   - pypy-5.3.1
 install:
   - sudo rabbitmq-plugins enable rabbitmq_management

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,10 @@
 Changelog
 =========
 
+Version 2.2.2
+-------------
+- Fixed potential Heartbeat deadlock when forcefully killing process - Thanks Charles Pierre.
+
 Version 2.2.1
 -------------
 - Fixed potential Channel leak [#36] - Thanks Adam Mills.

diff --git a/README.rst b/README.rst
@@ -21,6 +21,10 @@ Additional documentation is available on `amqpstorm.io <https://www.amqpstorm.io
 Changelog
 =========
 
+Version 2.2.2
+-------------
+- Fixed potential Heartbeat deadlock when forcefully killing process - Thanks Charles Pierre.
+
 Version 2.2.1
 -------------
 - Fixed potential Channel leak [#36] - Thanks Adam Mills.

diff --git a/amqpstorm/__init__.py b/amqpstorm/__init__.py
@@ -1,5 +1,5 @@
 """AMQPStorm."""
-__version__ = '2.2.1'  # noqa
+__version__ = '2.2.2'  # noqa
 __author__ = 'eandersson'  # noqa
 
 import logging

diff --git a/amqpstorm/heartbeat.py b/amqpstorm/heartbeat.py
@@ -45,8 +45,8 @@ def start(self, exceptions):
         """
         if not self._interval:
             return False
+        self._running.set()
         with self._lock:
-            self._running.set()
             self._threshold = 0
             self._reads_since_check = 0
             self._writes_since_check = 0

diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 
 setup(
     name='AMQPStorm',
-    version='2.2.1',
+    version='2.2.2',
     description='Thread-safe Python RabbitMQ Client & Management library.',
     long_description=open('README.rst').read(),
     author='Erik Olof Gunnar Andersson',