Releasing 1.2.6

eandersson · Nov 22, 2015 · 3919975 · 3919975
1 parent 8a1c587
commit 3919975
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,7 +1,8 @@
 # Changelog
 
-### Version 1.2.x
+### Version 1.2.6
 - TLSv1 or higher is now required for SSL connections.
+- Heartbeat Checker is no longer started before the Connection has been established.
 
 ### Version 1.2.5
 - Fixed Connection.Open bug triggered by the RabbitMQ Server not listening to the IPv6 loop-back.
@@ -11,7 +12,7 @@
 - Fixed compatibility issues with Python 2.6 and UriConnection.
 
 ### Version 1.2.3
-- Added a Client-side Heartbeat monitor.
+- Added a Client-side Heartbeat Checker.
 - Added Timeout to Connection.open.
 - Fixed potential bug in the Socket Poller error handling.
 

diff --git a/amqpstorm/__init__.py b/amqpstorm/__init__.py
@@ -1,5 +1,5 @@
 """AMQP-Storm."""
-__version__ = '1.2.5'
+__version__ = '1.2.6'
 __author__ = 'eandersson'
 
 import logging

diff --git a/amqpstorm/connection.py b/amqpstorm/connection.py
@@ -221,11 +221,11 @@ def _wait_for_connection_to_open(self):
         :return:
         """
         start_time = time.time()
-        timeout = self.parameters['timeout'] or 5
+        timeout = (self.parameters['timeout'] or 10) + 0.25
         while not self.is_open:
+            self.check_for_errors()
             if time.time() - start_time > timeout:
                 raise AMQPConnectionError('Connection timed out')
-            self.check_for_errors()
             sleep(IDLE_WAIT)
 
     def _read_buffer(self, buffer):

diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 """
 
 setup(name='AMQP-Storm',
-      version='1.2.5',
+      version='1.2.6',
       description='Thread-safe Python AMQP Client Library based on pamqp.',
       long_description=long_description,
       author='Erik Olof Gunnar Andersson',