From bd07aa97a77c13f1e6dcd449631f01d21b1900df Mon Sep 17 00:00:00 2001
From: Leo Hemsted <leo.hemsted@digital.cabinet-office.gov.uk>
Date: Wed, 19 Oct 2016 10:39:22 +0100
Subject: [PATCH 1/2] remove monotonic as a dependency

"On Python 3.3 or newer, monotonic will be an alias of time.monotonic from the standard library"
---
 app/__init__.py  | 2 +-
 requirements.txt | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/__init__.py b/app/__init__.py
index 9fb6999c7..6d7cff0dc 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -23,7 +23,7 @@ from flask_login import LoginManager
 from flask_wtf import CsrfProtect
 from functools import partial
 
-from monotonic import monotonic
+from time import monotonic
 from notifications_python_client.errors import HTTPError
 from notifications_utils import logging
 from notifications_utils.recipients import validate_phone_number, InvalidPhoneError
diff --git a/requirements.txt b/requirements.txt
index 09fb12758..3fad677df 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,6 @@ boto3==1.3.0
 Pygments==2.0.2
 py-gfm==0.1.2
 blinker==1.4
-monotonic==0.3
 lxml==3.6.0
 pyexcel==0.2.1
 pyexcel-io==0.1.0

From 3058a7122e9ada7e85e803e6c2688766d90440b3 Mon Sep 17 00:00:00 2001
From: Leo Hemsted <leo.hemsted@digital.cabinet-office.gov.uk>
Date: Wed, 19 Oct 2016 11:54:51 +0100
Subject: [PATCH 2/2] log exceptions in the admin app

(we weren't previously logging anything on error!)
---
 app/__init__.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/__init__.py b/app/__init__.py
index 6d7cff0dc..17b17c563 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -1,10 +1,12 @@
-import ago
 import os
 import re
 import urllib
-import dateutil
 from datetime import datetime, timedelta, timezone
+from time import monotonic
+
+import dateutil
 import pytz
+import ago
 from flask import (
     Flask,
     session,
@@ -16,14 +18,12 @@ from flask import (
     request,
     g,
     url_for)
-
 from flask._compat import string_types
 from flask.globals import _lookup_req_object
 from flask_login import LoginManager
 from flask_wtf import CsrfProtect
 from functools import partial
 
-from time import monotonic
 from notifications_python_client.errors import HTTPError
 from notifications_utils import logging
 from notifications_utils.recipients import validate_phone_number, InvalidPhoneError
@@ -373,6 +373,7 @@ def useful_headers_after_request(response):
 
 def register_errorhandlers(application):
     def _error_response(error_code):
+        application.logger.exception('Admin app errored with %s', error_code)
         resp = make_response(render_template("error/{0}.html".format(error_code)), error_code)
         return useful_headers_after_request(resp)