[ARVADOS] updated: d525bce65134ab333f27978bf8a44555e4590577

git at public.curoverse.com git at public.curoverse.com
Tue Jul 29 10:39:54 EDT 2014


Summary of changes:
 sdk/python/arvados/keep.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

       via  d525bce65134ab333f27978bf8a44555e4590577 (commit)
      from  673a10d2aabd1d9ed73fb6aeabb632f08f39a415 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit d525bce65134ab333f27978bf8a44555e4590577
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Jul 29 10:35:26 2014 -0400

    3351: Propagate caller-provided timeout from KeepClient to KeepWriterThread.
    
    Also, use the timeout in the sign_for_old_server block (even though
    this branch is unlikely to be used in real life now that the old Keep
    server has been replaced).

diff --git a/sdk/python/arvados/keep.py b/sdk/python/arvados/keep.py
index 2844242..fdb27f0 100644
--- a/sdk/python/arvados/keep.py
+++ b/sdk/python/arvados/keep.py
@@ -204,7 +204,7 @@ class KeepClient(object):
                           (str(threading.current_thread()),
                            self.args['data_hash'],
                            self.args['service_root']))
-            h = httplib2.Http(timeout=60)
+            h = httplib2.Http(timeout=self.args.get('timeout', None))
             url = self.args['service_root'] + self.args['data_hash']
             api_token = config.get('ARVADOS_API_TOKEN')
             headers = {'Authorization': "OAuth2 %s" % api_token}
@@ -224,7 +224,7 @@ class KeepClient(object):
                     body = KeepClient.sign_for_old_server(
                         self.args['data_hash'],
                         self.args['data'])
-                    h = httplib2.Http()
+                    h = httplib2.Http(timeout=self.args.get('timeout', None))
                     resp, content = h.request(url.encode('utf-8'), 'PUT',
                                               headers=headers,
                                               body=body)

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list