Skip to content
This repository has been archived by the owner on Sep 25, 2019. It is now read-only.

Allow for providing our own ioloop #4

Merged
merged 1 commit into from
Jan 9, 2013
Merged

Allow for providing our own ioloop #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions asyncdynamo/async_aws_sts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@ def __init__(self, aws_access_key_id=None, aws_secret_access_key=None,
is_secure=True, port=None, proxy=None, proxy_port=None,
proxy_user=None, proxy_pass=None, debug=0,
https_connection_factory=None, region=None, path='/',
converter=None):
converter=None, ioloop=None):
STSConnection.__init__(self, aws_access_key_id,
aws_secret_access_key,
is_secure, port, proxy, proxy_port,
proxy_user, proxy_pass, debug,
https_connection_factory, region, path, converter)
self.http_client = AsyncHTTPClient()
self.http_client = AsyncHTTPClient(io_loop=ioloop)

def get_session_token(self, callback):
'''
Expand Down Expand Up @@ -112,4 +112,4 @@ def make_request(self, action, params={}, path='/', verb='GET', callback=None):
def _finish_make_request(self, response, callback):
if response.error:
return callback(response.body, error=response.error)
return callback(response.body)
return callback(response.body)
9 changes: 5 additions & 4 deletions asyncdynamo/asyncdynamo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class AsyncDynamoDB(AWSAuthConnection):
def __init__(self, aws_access_key_id=None, aws_secret_access_key=None,
is_secure=True, port=None, proxy=None, proxy_port=None,
host=None, debug=0, session_token=None,
authenticate_requests=True, validate_cert=True, max_sts_attempts=3):
authenticate_requests=True, validate_cert=True, max_sts_attempts=3, ioloop=None):
if not host:
host = self.DefaultHost
self.validate_cert = validate_cert
Expand All @@ -87,9 +87,10 @@ def __init__(self, aws_access_key_id=None, aws_secret_access_key=None,
aws_secret_access_key,
is_secure, port, proxy, proxy_port,
debug=debug, security_token=session_token)
self.http_client = AsyncHTTPClient()
self.ioloop = ioloop or IOLoop.instance()
self.http_client = AsyncHTTPClient(io_loop=self.ioloop)
self.pending_requests = deque()
self.sts = AsyncAwsSts(aws_access_key_id, aws_secret_access_key)
self.sts = AsyncAwsSts(aws_access_key_id, aws_secret_access_key, ioloop=self.ioloop)
assert (isinstance(max_sts_attempts, int) and max_sts_attempts >= 0)
self.max_sts_attempts = max_sts_attempts

Expand Down Expand Up @@ -141,7 +142,7 @@ def raise_error():
else:
seconds_to_wait = (0.1*(2**attempts))
logging.warning("Got error[ %s ] getting session token, retrying in %.02f seconds" % (error, seconds_to_wait))
IOLoop.instance().add_timeout(time.time() + seconds_to_wait,
self.ioloop.add_timeout(time.time() + seconds_to_wait,
functools.partial(self._update_session_token, attempts=attempts+1, callback=callback, bypass_lock=True))
return
else:
Expand Down