create_connection_timeout and settings repr

Author: samuelcolvin

HISTORY.rst

@@ -3,6 +3,11 @@
 History
 -------
 
+v0.10.4 (2017-08-22)
+....................
+* ``RedisSettings`` repr method
+* add ``create_connection_timeout`` to connection pool
+
 v0.10.3 (2017-08-19)
 ....................
 * fix bug with ``RedisMixin.get_redis_pool`` creating multiple queues

arq/utils.py

@@ -13,7 +13,6 @@
 
 import aioredis
 from aioredis.pool import RedisPool
-from async_timeout import timeout
 
 __all__ = ['RedisSettings', 'RedisMixin', 'next_cron']
 logger = logging.getLogger('arq.utils')
@@ -47,6 +46,9 @@ def __init__(self,
         self.conn_retries = conn_retries
         self.conn_retry_delay = conn_retry_delay
 
+    def __repr__(self):
+        return '<RedisSettings {}>'.format(' '.join(f'{s}={getattr(self, s)}' for s in self.__slots__))
+
 
 class RedisMixin:
     """
@@ -74,9 +76,10 @@ async def create_redis_pool(self, *, _retry=0) -> RedisPool:
         """
         addr = self.redis_settings.host, self.redis_settings.port
         try:
-            with timeout(self.redis_settings.conn_timeout):
-                pool = await aioredis.create_pool(addr, loop=self.loop, db=self.redis_settings.database,
-                                                  password=self.redis_settings.password)
+            pool = await aioredis.create_pool(
+                addr, loop=self.loop, db=self.redis_settings.database, password=self.redis_settings.password,
+                create_connection_timeout=self.redis_settings.conn_timeout
+            )
         except (ConnectionError, OSError, aioredis.RedisError, asyncio.TimeoutError) as e:
             if _retry < self.redis_settings.conn_retries:
                 logger.warning('redis connection error %s %s, %d retries remaining...',

arq/version.py

@@ -2,4 +2,4 @@
 
 __all__ = ['VERSION']
 
-VERSION = StrictVersion('0.10.3')
+VERSION = StrictVersion('0.10.4')

setup.py

@@ -48,7 +48,7 @@
     """,
     install_requires=[
         'async-timeout>=1.2.1',
-        'aioredis>=0.3.1',
+        'aioredis>=0.3.3',
         'click>=6.7',
         'msgpack-python>=0.4.8',
     ],

tests/test_utils.py

@@ -15,6 +15,8 @@
 def test_settings_changed():
     settings = RedisSettings(port=123)
     assert settings.port == 123
+    assert ('<RedisSettings host=localhost port=123 database=0 password=None conn_retries=5 '
+            'conn_timeout=1 conn_retry_delay=1>') == str(settings)
 
 
 @pytest.mark.skipif(os.getenv('TZ') is None, reason='TZ=Asia/Singapore must be set')