summaryrefslogtreecommitdiff
path: root/monitoring
diff options
context:
space:
mode:
authorToshio Kuratomi <toshio@fedoraproject.org>2016-05-25 11:56:51 -0700
committerToshio Kuratomi <toshio@fedoraproject.org>2016-05-25 11:58:49 -0700
commit4b4557eb97bcabe5d920c44eb4f60a2deb8c5d67 (patch)
treef40fe360aa0e18d120ddf570106cec9c07614afd /monitoring
parent76cbe306451d0ecc95c6ac1787c03cd4cf22b0d8 (diff)
downloadansible-modules-extras-4b4557eb97bcabe5d920c44eb4f60a2deb8c5d67.tar.gz
Fix exception catching for python3
Diffstat (limited to 'monitoring')
-rw-r--r--monitoring/honeybadger_deployment.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/monitoring/honeybadger_deployment.py b/monitoring/honeybadger_deployment.py
index 457daa98..3a6d2df7 100644
--- a/monitoring/honeybadger_deployment.py
+++ b/monitoring/honeybadger_deployment.py
@@ -22,7 +22,7 @@ DOCUMENTATION = '''
---
module: honeybadger_deployment
author: "Benjamin Curtis (@stympy)"
-version_added: "2.1"
+version_added: "2.2"
short_description: Notify Honeybadger.io about app deployments
description:
- Notify Honeybadger.io about app deployments (see http://docs.honeybadger.io/article/188-deployment-tracking)
@@ -78,6 +78,11 @@ RETURN = '''# '''
import urllib
+# import module snippets
+from ansible.module_utils.basic import *
+from ansible.module_utils.pycompat24 import get_exception
+from ansible.module_utils.urls import *
+
# ===========================================
# Module execution.
#
@@ -122,7 +127,8 @@ def main():
try:
data = urllib.urlencode(params)
response, info = fetch_url(module, url, data=data)
- except Exception, e:
+ except Exception:
+ e = get_exception()
module.fail_json(msg='Unable to notify Honeybadger: %s' % e)
else:
if info['status'] == 200:
@@ -130,10 +136,6 @@ def main():
else:
module.fail_json(msg="HTTP result code: %d connecting to %s" % (info['status'], url))
-# import module snippets
-from ansible.module_utils.basic import *
-from ansible.module_utils.urls import *
-
if __name__ == '__main__':
main()