scottk/wlan-lanforge-scripts
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-lanforge-scripts.git synced 2025-11-21 20:45:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

JSON: simplifies die_on_error logic

Browse Source
This commit is contained in:
Jed Reynolds
2020-07-28 23:39:58 -07:00
parent 93e80df537
commit b9bcba58b0
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
py-json/LANforge/LFRequest.py
View File

@@ -47,6 +47,8 @@ class LFRequest:
# request first url on stack # request first url on stack
def formPost(self, show_error=True, debug=False, die_on_error_=False): def formPost(self, show_error=True, debug=False, die_on_error_=False):
if self.die_on_error:
die_on_error_ = True
if (debug == False) and (self.debug == True): if (debug == False) and (self.debug == True):
debug = True; debug = True;
responses = [] responses = []
@@ -87,16 +89,15 @@ class LFRequest:
LFUtils.debug_printer.pprint(responses[0].reason) LFUtils.debug_printer.pprint(responses[0].reason)
print("------------------------------------------------------------------------") print("------------------------------------------------------------------------")
if (die_on_error_ == True) or (self.die_on_error == True): if die_on_error_:
exit(1) exit(1)
except urllib.error.URLError as uerror: except urllib.error.URLError as uerror:
if (show_error): if show_error:
print("----- LFRequest::formPost:94 URLError: ---------------------------------------------") print("----- LFRequest::formPost:94 URLError: ---------------------------------------------")
print("Reason: %s; URL: %s"%(uerror.reason, request.get_full_url())) print("Reason: %s; URL: %s"%(uerror.reason, request.get_full_url()))
print("------------------------------------------------------------------------") print("------------------------------------------------------------------------")
if (die_on_error_ == True) or (self.die_on_error == True): if (die_on_error_ == True) or (self.die_on_error == True):
exit(1) exit(1)
return None return None
def jsonPost(self, show_error=True, debug=False, die_on_error_=False, response_json_list_=None): def jsonPost(self, show_error=True, debug=False, die_on_error_=False, response_json_list_=None):
@@ -167,10 +168,12 @@ class LFRequest:
return None return None
def get(self, debug=False, die_on_error_=False): def get(self, debug=False, die_on_error_=False):
if (debug == False) and (self.debug == True): if self.debug == True:
debug = True debug = True
if (debug): if self.die_on_error == True:
print("get: url: "+self.requested_url) die_on_error_ = True
if debug:
print("LFUtils.get: url: "+self.requested_url)
myrequest = urllib.request.Request(url=self.requested_url, headers=self.default_headers) myrequest = urllib.request.Request(url=self.requested_url, headers=self.default_headers)
myresponses = [] myresponses = []
try: try:
@@ -198,14 +201,15 @@ class LFRequest:
print("----- Response: --------------------------------------------------------") print("----- Response: --------------------------------------------------------")
LFUtils.debug_printer.pprint(myresponses[0].reason) LFUtils.debug_printer.pprint(myresponses[0].reason)
print("------------------------------------------------------------------------") print("------------------------------------------------------------------------")
if (die_on_error_ == True) or (self.die_on_error == True): if die_on_error_ == True:
# print("--------------------------------------------- s.doe %s v doe %s ---------------------------" % (self.die_on_error, die_on_error_))
exit(1) exit(1)
except urllib.error.URLError as uerror: except urllib.error.URLError as uerror:
if debug: if debug:
print("----- LFRequest::get:205 URLError: ---------------------------------------------") print("----- LFRequest::get:205 URLError: ---------------------------------------------")
print("Reason: %s; URL: %s"%(uerror.reason, myrequest.get_full_url())) print("Reason: %s; URL: %s"%(uerror.reason, myrequest.get_full_url()))
print("------------------------------------------------------------------------") print("------------------------------------------------------------------------")
if (die_on_error_ == True) or (self.die_on_error == True): if die_on_error_ == True:
exit(1) exit(1)
return None return None