Hh 145802

.bumpversion.cfg

@@ -1,7 +1,7 @@
 [bumpversion]
 commit = True
 tag = True
-current_version = 0.1.4
+current_version = 0.2.6
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?
 serialize = 
 	{major}.{minor}.{patch}-{release}

consul/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.1.4'
+__version__ = '0.2.6'
 
 from consul.base import ACLDisabled  # noqa
 from consul.base import ACLPermissionDenied  # noqa

consul/aio.py

@@ -5,6 +5,7 @@
 import warnings
 
 import aiohttp
+from aiohttp import ClientTimeout
 
 from consul import base
 
@@ -20,10 +21,10 @@ def __init__(self, *args, loop=None, **kwargs):
         self._session = None
         self._loop = loop or asyncio.get_event_loop()
 
-    async def _request(self, callback, method, uri, data=None, headers=None):
+    async def _request(self, callback, method, uri, data=None, headers=None, total_timeout=None):
         connector = aiohttp.TCPConnector(loop=self._loop,
                                          verify_ssl=self.verify)
-        async with aiohttp.ClientSession(connector=connector) as session:
+        async with aiohttp.ClientSession(connector=connector, timeout=ClientTimeout(total=total_timeout)) as session:
             self._session = session
             resp = await session.request(method=method,
                                          url=uri,
@@ -47,9 +48,9 @@ def __del__(self):
                               ResourceWarning)
                 asyncio.ensure_future(self.close())
 
-    async def get(self, callback, path, params=None, headers=None):
+    async def get(self, callback, path, params=None, headers=None, total_timeout=None):
         uri = self.uri(path, params)
-        return await self._request(callback, 'GET', uri, headers=headers)
+        return await self._request(callback, 'GET', uri, headers=headers, total_timeout=total_timeout)
 
     async def put(self, callback, path, params=None, data='', headers=None):
         uri = self.uri(path, params)