From e4926e09a7cea0e667412287c3e56940c7813731 Mon Sep 17 00:00:00 2001
From: Simon Detheridge <s@sd.ai>
Date: Fri, 14 Feb 2020 10:50:52 +0000
Subject: [PATCH] Move error handler to be the last middleware

---
 services/filestore/app.js                  | 4 +++-
 services/filestore/app/js/RequestLogger.js | 7 +------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/services/filestore/app.js b/services/filestore/app.js
index 84182c3dcf..e48e8ae3c8 100644
--- a/services/filestore/app.js
+++ b/services/filestore/app.js
@@ -16,7 +16,7 @@ const RequestLogger = require('./app/js/RequestLogger')
 
 const app = express()
 
-RequestLogger.attach(app)
+app.use(RequestLogger.middleware)
 
 if (settings.sentry && settings.sentry.dsn) {
   logger.initializeErrorReporting(settings.sentry.dsn)
@@ -140,6 +140,8 @@ app.get('/status', function(req, res) {
 
 app.get('/health_check', healthCheckController.check)
 
+app.use(RequestLogger.errorHandler)
+
 const port = settings.internal.filestore.port || 3009
 const host = '0.0.0.0'
 
diff --git a/services/filestore/app/js/RequestLogger.js b/services/filestore/app/js/RequestLogger.js
index fd72d85d17..fa1fc14426 100644
--- a/services/filestore/app/js/RequestLogger.js
+++ b/services/filestore/app/js/RequestLogger.js
@@ -15,13 +15,8 @@ class RequestLogger {
     this._logMessage = message
   }
 
-  static attach(app) {
-    app.use(RequestLogger.middleware)
-    app.use(RequestLogger.errorHandler)
-  }
-
   static errorHandler(err, req, res, next) {
-    req.requestLogger._logInfo.error = err
+    req.requestLogger.addFields({ error: err })
     res
       .send(err.message)
       .status(500)