This is an automated email from the ASF dual-hosted git repository.
csantanapr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git
The following commit(s) were added to refs/heads/master by this push:
new 16ab335 Add HTTP request timeout. (#3301)
16ab335 is described below
commit 16ab33543c01634636682115da7862f5e9930ad0
Author: rodric rabbah <rod...@gmail.com>
AuthorDate: Tue Feb 20 00:29:11 2018 -0500
Add HTTP request timeout. (#3301)
---
tools/admin/wskutil.py | 36 +++++++++++++++---------------------
1 file changed, 15 insertions(+), 21 deletions(-)
diff --git a/tools/admin/wskutil.py b/tools/admin/wskutil.py
index 06b00d1..59320d1 100644
--- a/tools/admin/wskutil.py
+++ b/tools/admin/wskutil.py
@@ -24,21 +24,22 @@ import json
import httplib
import ssl
import base64
+import socket
from urlparse import urlparse
# global configurations, can control whether to allow untrusted certificates
# on HTTPS connections
httpRequestProps = {'secure': True}
-def request(method, urlString, body = '', headers = {}, auth = None, verbose =
False, https_proxy = os.getenv('https_proxy', None)):
+def request(method, urlString, body = '', headers = {}, auth = None, verbose =
False, https_proxy = os.getenv('https_proxy', None), timeout = 10):
url = urlparse(urlString)
if url.scheme == 'http':
- conn = httplib.HTTPConnection(url.netloc)
+ conn = httplib.HTTPConnection(url.netloc, timeout = timeout)
else:
if httpRequestProps['secure'] or not hasattr(ssl,
'_create_unverified_context'):
- conn = httplib.HTTPSConnection(url.netloc if https_proxy is None
else https_proxy)
+ conn = httplib.HTTPSConnection(url.netloc if https_proxy is None
else https_proxy, timeout = timeout)
else:
- conn = httplib.HTTPSConnection(url.netloc if https_proxy is None
else https_proxy, context=ssl._create_unverified_context())
+ conn = httplib.HTTPSConnection(url.netloc if https_proxy is None
else https_proxy, context=ssl._create_unverified_context(), timeout = timeout)
if https_proxy:
conn.set_tunnel(url.netloc)
@@ -77,28 +78,21 @@ def request(method, urlString, body = '', headers = {},
auth = None, verbose = F
print(res.read())
print('========')
return res
+ except socket.timeout:
+ return ErrorResponse(status = 500, error = 'request timed out at %d
seconds' % timeout)
except Exception as e:
- res = dict2obj({ 'status' : 500, 'error': str(e) })
- return res
+ return ErrorResponse(status = 500, error = str(e))
def getPrettyJson(obj):
return json.dumps(obj, sort_keys=True, indent=4, separators=(',', ': '))
-# class to convert dictionary to objects
-class dict2obj(dict):
- def __getattr__(self, name):
- if name in self:
- return self[name]
- else:
- raise AttributeError('object has no attribute "%s"' % name)
-
- def __setattr__(self, name, value):
- self[name] = value
+# class to normalize responses for exceptions with no HTTP response for
canonical error handling
+class ErrorResponse:
+ def __init__(self, status, error):
+ self.status = status
+ self.error = error
- def __delattr__(self, name):
- if name in self:
- del self[name]
- else:
- raise AttributeError('object has no attribute "%s"' % name)
+ def read(self):
+ return self.error
--
To stop receiving notification emails like this one, please contact
csantan...@apache.org.
