wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated 'ongoing' to also return properly formatted json

Browse source
This commit is contained in:
Bruce Pennypacker 2015-06-12 19:58:57 +00:00 committed by Matt Clay
parent 461beed833
commit 07aa5bc09a
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/modules/extras/monitoring/pagerduty.py
View file

@ -158,7 +158,12 @@ def ongoing(module, name, user, passwd, token):
if info['status'] != 200: if info['status'] != 200:
module.fail_json(msg="failed to lookup the ongoing window: %s" % info['msg']) module.fail_json(msg="failed to lookup the ongoing window: %s" % info['msg'])
return False, response.read(), False try:
json_out = json.loads(response.read())
except:
json_out = ""
return False, json_out, False
def create(module, name, user, passwd, token, requester_id, service, hours, minutes, desc): def create(module, name, user, passwd, token, requester_id, service, hours, minutes, desc):