[ARVADOS] updated: 1c1c11c2c2d6cfd1d379cdbb166498514768be4e

Git user git at public.curoverse.com
Thu Apr 6 16:43:45 EDT 2017


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

       via  1c1c11c2c2d6cfd1d379cdbb166498514768be4e (commit)
      from  1d0d28c791e88f817b1c01560ee8efd70bcab41e (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 1c1c11c2c2d6cfd1d379cdbb166498514768be4e
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Apr 6 16:43:36 2017 -0400

    8104: Do not close sockets after giving them to pycurl. Reverts 7b31dd40b31bdbf7473b50fd407cd6f636657c69.

diff --git a/sdk/python/arvados/keep.py b/sdk/python/arvados/keep.py
index c24b7c1..5b4770c 100644
--- a/sdk/python/arvados/keep.py
+++ b/sdk/python/arvados/keep.py
@@ -278,7 +278,6 @@ class KeepClient(object):
             self._result = {'error': None}
             self._usable = True
             self._session = None
-            self._socket = None
             self.get_headers = {'Accept': 'application/octet-stream'}
             self.get_headers.update(headers)
             self.put_headers = headers
@@ -330,7 +329,6 @@ class KeepClient(object):
             if hasattr(socket, 'TCP_KEEPIDLE'):
                 s.setsockopt(socket.IPPROTO_TCP, socket.TCP_KEEPIDLE, 75)
             s.setsockopt(socket.IPPROTO_TCP, socket.TCP_KEEPINTVL, 75)
-            self._socket = s
             return s
 
         def get(self, locator, method="GET", timeout=None):
@@ -358,10 +356,6 @@ class KeepClient(object):
                         curl.perform()
                     except Exception as e:
                         raise arvados.errors.HttpError(0, str(e))
-                    finally:
-                        if self._socket:
-                            self._socket.close()
-                            self._socket = None
                     self._result = {
                         'status_code': curl.getinfo(pycurl.RESPONSE_CODE),
                         'body': response_body.getvalue(),
@@ -446,10 +440,6 @@ class KeepClient(object):
                         curl.perform()
                     except Exception as e:
                         raise arvados.errors.HttpError(0, str(e))
-                    finally:
-                        if self._socket:
-                            self._socket.close()
-                            self._socket = None
                     self._result = {
                         'status_code': curl.getinfo(pycurl.RESPONSE_CODE),
                         'body': response_body.getvalue(),

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list