kellya/matrix-webhook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: correct except clauses missing exceptions

Browse source
This commit is contained in:
Alex Kelly 2021-11-03 23:42:44 -04:00
parent 1ea47991e4
commit 87ac023631
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
matrix_webhook/formatters/pingdom.py
View file

@ -3,7 +3,7 @@ from datetime import datetime
def formatter(data, headers): def formatter(data, headers):
"""Pretty-print a pingdom notification.""" """Pretty-print a pingdom notification."""
#JSON data formatting was obtained from https://www.pingdom.com/resources/webhooks/ # JSON data formatting was obtained from https://www.pingdom.com/resources/webhooks/
check_id = data["check_id"] check_id = data["check_id"]
check_name = data["check_name"] check_name = data["check_name"]
current_state = data["current_state"] current_state = data["current_state"]
@ -38,11 +38,11 @@ def formatter(data, headers):
second_ip = "unknown" second_ip = "unknown"
try: try:
first_location = data["first_probe"]["location"] first_location = data["first_probe"]["location"]
except: except KeyError:
first_location = "unknown" first_location = "unknown"
try: try:
second_location = data["second_probe"]["location"] second_location = data["second_probe"]["location"]
except: except KeyError:
second_location = "unknown" second_location = "unknown"
try: try:
expected_ip = data["check_params"]["expected_ip"] expected_ip = data["check_params"]["expected_ip"]

3
matrix_webhook/handler.py
View file

@ -37,9 +37,6 @@ async def matrix_webhook(request):
if "formatter" in request.rel_url.query: if "formatter" in request.rel_url.query:
try: try:
# data = getattr(formatters, request.rel_url.query["formatter"])(
# data, request.headers
# )
format = request.rel_url.query["formatter"] format = request.rel_url.query["formatter"]
plugin = importlib.import_module(f"matrix_webhook.formatters.{format}", "formatter") plugin = importlib.import_module(f"matrix_webhook.formatters.{format}", "formatter")
data = plugin.formatter(data, request.headers) data = plugin.formatter(data, request.headers)