cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

forgot finally 2.4 syntax

Browse source
This commit is contained in:
Brian Coca 2015-06-19 12:13:43 -04:00 committed by Matt Clay
parent bfa63e01e5
commit a4a17630cd
1 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
lib/ansible/modules/extras/monitoring/sensu_check.py
View file

@ -183,19 +183,20 @@ def sensu_check(module, path, name, state='present', backup=False):
import simplejson as json
try:
stream = open(path, 'r')
config = json.load(stream.read())
except IOError, e:
if e.errno is 2: # File not found, non-fatal
if state == 'absent':
reasons.append('file did not exist and state is `absent\'')
return changed, reasons
config = {}
else:
module.fail_json(msg=str(e))
except ValueError:
msg = '{path} contains invalid JSON'.format(path=path)
module.fail_json(msg=msg)
try:
stream = open(path, 'r')
config = json.load(stream.read())
except IOError, e:
if e.errno is 2: # File not found, non-fatal
if state == 'absent':
reasons.append('file did not exist and state is `absent\'')
return changed, reasons
config = {}
else:
module.fail_json(msg=str(e))
except ValueError:
msg = '{path} contains invalid JSON'.format(path=path)
module.fail_json(msg=msg)
finally:
if stream:
stream.close()
@ -277,10 +278,11 @@ def sensu_check(module, path, name, state='present', backup=False):
if backup:
module.backup_local(path)
try:
stream = open(path, 'w')
stream.write(json.dumps(config, indent=2) + '\n')
except IOError, e:
module.fail_json(msg=str(e))
try:
stream = open(path, 'w')
stream.write(json.dumps(config, indent=2) + '\n')
except IOError, e:
module.fail_json(msg=str(e))
finally:
if stream:
stream.close()