From 63fa086fcc8c4bd47109c76f45f024b71a4c6e94 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Fri, 5 Apr 2013 22:42:07 +0530 Subject: [PATCH] cli: Handle URLError, variable refactor used passed variable Signed-off-by: Rohit Yadav --- tools/cli/cloudmonkey/requester.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/cli/cloudmonkey/requester.py b/tools/cli/cloudmonkey/requester.py index d58c1af4683..e6ea6a1c660 100644 --- a/tools/cli/cloudmonkey/requester.py +++ b/tools/cli/cloudmonkey/requester.py @@ -32,7 +32,7 @@ try: import types import urllib import urllib2 - from urllib2 import urlopen, HTTPError + from urllib2 import urlopen, HTTPError, URLError except ImportError, e: print "Import error in %s : %s" % (__name__, e) @@ -80,10 +80,12 @@ def make_request(command, args, logger, host, port, response = connection.read() except HTTPError, e: error = "%s: %s" % (e.msg, e.info().getheader('X-Description')) + except URLError, e: + error = e.reason logger_debug(logger, "Response received: %s" % response) if error is not None: - logger_debug(logger, "Error: error is not None, %s" % (error)) + logger_debug(logger, "Error: %s" % (error)) return response, error return response, error @@ -91,7 +93,6 @@ def make_request(command, args, logger, host, port, def monkeyrequest(command, args, isasync, asyncblock, logger, host, port, apikey, secretkey, timeout, protocol, path): - fcommand = command response = None error = None logger_debug(logger, "======== START Request ========") @@ -133,9 +134,7 @@ def monkeyrequest(command, args, isasync, asyncblock, logger, host, port, timeout = timeout - pollperiod logger_debug(logger, "Job %s to timeout in %ds" % (jobid, timeout)) sys.stdout.flush() - if re.match("queryAsyncJobResult", fcommand): - # logger_debug(logger, "%d loop: Job %s" % (progress, jobid)) - # sys.stdout.flush() + if re.match("queryAsyncJobResult", command): time.sleep(pollperiod) else: response, error = monkeyrequest(command, request, isasync,