ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-26 12:21:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Change handle_httperror in httpapi plugins (#53391)

Browse source 
* Change return of handle_httperror

* Fix restconf for handle_httperror changes
This commit is contained in:
Nathaniel Case 2019-03-06 12:13:58 -05:00 • committed by GitHub
parent 662dd2c1de
commit 3fe2013b3f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

34
lib/ansible/plugins/httpapi/restconf.py
View file

@ -62,30 +62,26 @@ class HttpApi(HttpApiBase):
'Content-Type': message_kwargs.get('content_type') or CONTENT_TYPE,
'Accept': message_kwargs.get('accept') or CONTENT_TYPE,
}
try:
response, response_data = self.connection.send(path, data, headers=headers, method=message_kwargs.get('method'))
except HTTPError as exc:
response_data = exc
response, response_data = self.connection.send(path, data, headers=headers, method=message_kwargs.get('method'))
return handle_response(response_data)
def handle_httperror(self, exc):
return None
return handle_response(response, response_data)
def handle_response(response):
def handle_response(response, response_data):
try:
response_json = json.loads(response.read())
response_data = json.loads(response_data.read())
except ValueError:
if isinstance(response, HTTPError):
raise ConnectionError(to_text(response), code=response.code)
return response.read()
response_data = response_data.read()
if 'errors' in response_json and 'jsonrpc' not in response_json:
errors = response_json['errors']['error']
if isinstance(response, HTTPError):
if response_data:
if 'errors' in response_data:
errors = response_data['errors']['error']
error_text = '\n'.join((error['error-message'] for error in errors))
else:
error_text = response_data
error_text = '\n'.join((error['error-message'] for error in errors))
raise ConnectionError(error_text, code=response.code)
raise ConnectionError(to_text(response), code=response.code)
raise ConnectionError(error_text, code=response.code)
return response_json
return response_data