Merge pull request #2919 from fabulops/campfire_notification_fixes

Campfire Notification Module: Typo fixes, tighter error handling, corrected check mode support
reviewable/pr18780/r1
Michael DeHaan 12 years ago
commit 5cd49bff8f

@ -78,7 +78,7 @@ def main():
"tada", "tmyk", "trombone", "vuvuzela", "tada", "tmyk", "trombone", "vuvuzela",
"yeah", "yodel"]), "yeah", "yodel"]),
), ),
supports_check_mode=True supports_check_mode=False
) )
subscription = module.params["subscription"] subscription = module.params["subscription"]
@ -117,8 +117,14 @@ def main():
req.add_header('User-agent', AGENT) req.add_header('User-agent', AGENT)
response = opener.open(req) 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: 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) module.exit_json(changed=True, room=room, msg=msg, notify=notify)

Loading…
Cancel
Save