darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-09-09 16:29:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2963 from alphagov/catch-exception-for-event

Browse Source 
Catch and log any exception thrown in the checkin event method.
This commit is contained in:
Rebecca Law
2020-09-10 13:16:08 +01:00
committed by GitHub
parent 92af5b8d67 da4efbbb82
commit 8d4228dd55
1 changed files with 44 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/__init__.py
View File

@@ -352,6 +352,7 @@ def setup_sqlalchemy_events(app):
@event.listens_for(db.engine, 'checkout') @event.listens_for(db.engine, 'checkout')
def checkout(dbapi_connection, connection_record, connection_proxy): def checkout(dbapi_connection, connection_record, connection_proxy):
try:
# connection given to a web worker # connection given to a web worker
TOTAL_CHECKED_OUT_DB_CONNECTIONS.inc() TOTAL_CHECKED_OUT_DB_CONNECTIONS.inc()
@@ -384,9 +385,12 @@ def setup_sqlalchemy_events(app):
'host': 'unknown', 'host': 'unknown',
'url_rule': 'unknown', 'url_rule': 'unknown',
} }
except Exception:
current_app.logger.exception("Exception caught for checkout event.")
@event.listens_for(db.engine, 'checkin') @event.listens_for(db.engine, 'checkin')
def checkin(dbapi_connection, connection_record): def checkin(dbapi_connection, connection_record):
try:
# connection returned by a web worker # connection returned by a web worker
TOTAL_CHECKED_OUT_DB_CONNECTIONS.dec() TOTAL_CHECKED_OUT_DB_CONNECTIONS.dec()
@@ -398,3 +402,5 @@ def setup_sqlalchemy_events(app):
connection_record.info['request_data']['host'], connection_record.info['request_data']['host'],
connection_record.info['request_data']['url_rule'] connection_record.info['request_data']['url_rule']
).observe(duration) ).observe(duration)
except Exception:
current_app.logger.exception("Exception caught for checkin event.")