Sysdeploy/ansible-modules-syncthing
5
0
Fork 2
Code Issues 1 Pull Requests 1 Packages Projects 2 Releases Wiki Activity

Handle non-JSON return values
All checks were successful
buildbot/multibuild_parent Build done.
Details
buildbot/travis_bionic Build done.
Details

Browse Source
This commit is contained in:
Peter Šurda 2024-04-22 16:20:30 +08:00
parent 0b5fd3a2cf
commit b7e3210631
Signed by: PeterSurda
GPG Key ID: 3E47497CF67ABB95
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
collection/plugins/modules/device.py
View File

@ -157,12 +157,14 @@ def remote_config(module, method='GET', config=None, result=None, device=None,
try: try:
content = resp.read() content = resp.read()
return json.loads(content) except AttributeError:
except (AttributeError, json.decoder.JSONDecodeError):
result['content'] = info.pop('body', '') result['content'] = info.pop('body', '')
module.fail_json(msg='Error occured while reading response', **result) module.fail_json(msg='Error occured while reading response', **result)
return {} # not reachable but prevents linter complaints try:
return json.loads(content)
except json.decoder.JSONDecodeError:
return {'content': content}
def get_device(module, device=None): def get_device(module, device=None):