Skip to content

Logging 500 errors #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AmanuelAaron wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Logging 500 errors #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6037bbf
added logging for 500 errors
AmanuelAaron Jul 10, 2019
6164649
Merge branch 'master' into error-log
AmanuelAaron Jul 10, 2019
6f90307
Merge branch 'master' into error-log
AmanuelAaron Jul 15, 2019
ca32e85
error logs in JSON format
AmanuelAaron Jul 15, 2019
49ad154
remove extra print
AmanuelAaron Jul 15, 2019
c271c11
remove test artifact
AmanuelAaron Jul 15, 2019
e247504
made code more dry + added test for unkown error
AmanuelAaron Jul 15, 2019
2e7ac2a
updated tests and pycov threshold
AmanuelAaron Jul 15, 2019
9e91a2a
styling
AmanuelAaron Jul 15, 2019
e4f18f4
added structured error messaging
AmanuelAaron Jul 17, 2019
bc01fcf
Merge branch 'master' into error-log
AmanuelAaron Jul 17, 2019
1cb5195
Merge branch 'master' into error-log
AmanuelAaron Jul 17, 2019
cbca3b6
Merge branch 'master' into error-log
AmanuelAaron Aug 2, 2019
764bda3
Merge branch 'master' into error-log
AmanuelAaron Aug 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ jobs:
- run:
name: PyTest Cover
command: |
pytest --cov-fail-under=88 --cov=./ --cov-report=xml
pytest --cov-fail-under=85 --cov=./ --cov-report=xml
- codecov/upload:
file: ./coverage.xml

Expand Down
113 changes: 102 additions & 11 deletions nazgul/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,21 @@
logger.addHandler(fh)


class StructuredMessage(object):
def __init__(self, message, **kwargs):
self.message = message
self.kwargs = kwargs

def __str__(self):
return "%s >>> %s" % (self.message, json.dumps(self.kwargs))


def print_json_log(message, time, method, path):
fields = {"method": method, "msg": message, "path": path}

print(StructuredMessage(message, Timestamp=time, Fields=fields))


@auth.verify_password
def verify_password(username, password):
if username in users:
Expand Down Expand Up @@ -88,10 +103,16 @@ def location_show():
xml.prepare_locations(product, locations)
data = xml.render()
status = 200
except Exception:
except Exception as e:
data = xml.error("Unknown error")
status = 500

print_json_log(
"Uncaught Exception: {0}".format(e),
"%.0f" % (time.time() * 1000000000),
request.method,
request.full_path,
)
return Response(data, mimetype="text/xml"), status


Expand Down Expand Up @@ -119,10 +140,17 @@ def location_add():
except ModelError as e:
data = xml.error(e.message, errno=e.errno)
status = 400
except Exception:
except Exception as e:
data = xml.error("Unknown error")
status = 500

print_json_log(
"Uncaught Exception: {0}".format(e),
"%.0f" % (time.time() * 1000000000),
request.method,
request.full_path,
)

return Response(data, mimetype="text/xml"), status


Expand All @@ -144,10 +172,17 @@ def location_modify():
except ModelError as e:
data = xml.error(e.message, errno=e.errno)
status = 400
except Exception:
except Exception as e:
data = xml.error("Unknown error")
status = 500

print_json_log(
"Uncaught Exception: {0}".format(e),
"%.0f" % (time.time() * 1000000000),
request.method,
request.full_path,
)

return Response(data, mimetype="text/xml"), status


Expand All @@ -168,9 +203,16 @@ def location_delete():
except ModelError as e:
data = xml.error(e.message, errno=e.errno)
status = 400
except Exception:
except Exception as e:
data = xml.error("Unknown error")
status = 500

print_json_log(
"Uncaught Exception: {0}".format(e),
"%.0f" % (time.time() * 1000000000),
request.method,
request.full_path,
)
return Response(data, mimetype="text/xml"), status


Expand All @@ -186,10 +228,17 @@ def product_show():
xml.prepare_products(res)
data = xml.render()
status = 200
except Exception:
except Exception as e:
data = xml.error("Unknown error")
status = 500

print_json_log(
"Uncaught Exception: {0}".format(e),
"%.0f" % (time.time() * 1000000000),
request.method,
request.full_path,
)

return Response(data, mimetype="text/xml"), status


Expand All @@ -209,10 +258,17 @@ def product_add():
except ModelError as e:
data = xml.error(e.message, errno=e.errno)
status = 400
except Exception:
except Exception as e:
data = xml.error("Unknown error")
status = 500

print_json_log(
"Uncaught Exception: {0}".format(e),
"%.0f" % (time.time() * 1000000000),
request.method,
request.full_path,
)

return Response(data, mimetype="text/xml"), status


Expand All @@ -234,10 +290,17 @@ def product_delete():
except ModelError as e:
data = xml.error(e.message, errno=e.errno)
status = 400
except Exception:
except Exception as e:
data = xml.error("Unknown error")
status = 500

print_json_log(
"Uncaught Exception: {0}".format(e),
"%.0f" % (time.time() * 1000000000),
request.method,
request.full_path,
)

return Response(data, mimetype="text/xml"), status


Expand All @@ -256,9 +319,16 @@ def product_language_add():
except ModelError as e:
data = xml.error(e.message, errno=e.errno)
status = 400
except Exception:
except Exception as e:
data = xml.error("Unknown error")
status = 500

print_json_log(
"Uncaught Exception: {0}".format(e),
"%.0f" % (time.time() * 1000000000),
request.method,
request.full_path,
)
return Response(data, mimetype="text/xml"), status


Expand All @@ -276,9 +346,16 @@ def product_language_delete():
except ModelError as e:
data = xml.error(e.message, errno=e.errno)
status = 400
except Exception:
except Exception as e:
data = xml.error("Unknown error")
status = 500

print_json_log(
"Uncaught Exception: {0}".format(e),
"%.0f" % (time.time() * 1000000000),
request.method,
request.full_path,
)
return Response(data, mimetype="text/xml"), status


Expand Down Expand Up @@ -314,9 +391,16 @@ def uptake():
# Error no. for /uptake is always 102 in Tuxedo (Should this be changed in Nazgul?)
data = xml.error(e.message, errno=102)
status = 400
except Exception:
except Exception as e:
data = xml.error("Unknown error")
status = 500

print_json_log(
"Uncaught Exception: {0}".format(e),
"%.0f" % (time.time() * 1000000000),
request.method,
request.full_path,
)
return Response(data, mimetype="text/xml"), status


Expand All @@ -342,7 +426,14 @@ def create_update_alias():
except ModelError as e:
data = xml.error(e.message, errno=e.errno)
status = 400
except Exception:
except Exception as e:
data = xml.error("Unknown error")
status = 500

print_json_log(
"Uncaught Exception: {0}".format(e),
"%.0f" % (time.time() * 1000000000),
request.method,
request.full_path,
)
return Response(data, mimetype="text/xml"), status
13 changes: 12 additions & 1 deletion tests/test_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,18 @@ def test_product_language_add_no_match(client):
assert expected == rv.data


def test_product_language_delete(client):
def test_product_language_delete_single(client):
rv = client.post(
"api/product_language_delete/",
data={"product": "AaronProduct", "languages": ["en-GB"]},
headers={"Authorization": requests.auth._basic_auth_str(test_user, test_pass)},
)
expected = b'<?xml version="1.0" encoding="utf-8"?><success>SUCCESS: language has been deleted</success>'
msm._reset_db()
assert expected == rv.data


def test_product_language_delete_multiple(client):
rv = client.post(
"api/product_language_delete/",
data={"product": "AaronProduct", "languages": ["en-GB", "en-US"]},
Expand Down