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

Merge pull request #2919 from fabulops/campfire_notification_fixes

Browse source 
Campfire Notification Module: Typo fixes, tighter error handling, corrected check mode support
This commit is contained in:
Michael DeHaan 2013-05-18 12:57:57 -07:00
commit d6048425e3
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
library/notification/campfire
View file

@ -78,7 +78,7 @@ def main():
"tada", "tmyk", "trombone", "vuvuzela",
"yeah", "yodel"]),
),
supports_check_mode=True
supports_check_mode=False
)
subscription = module.params["subscription"]
@ -117,8 +117,14 @@ def main():
req.add_header('User-agent', AGENT)
response = opener.open(req)
except urllib2.HTTPError, e:
if not (200 <= e.code < 300):
module.fail_json(msg="unable to send msg: '%s', campfire api"
" returned error code: '%s'" %
(msg, e.code))
except Exception, e:
module.fail_json(msg="unable to sent msg: %s" % e)
module.fail_json(msg="unable to send msg: %s" % msg)
module.exit_json(changed=True, room=room, msg=msg, notify=notify)