Merge pull request #585 from outline/jori/koa-onerror

Catch server errors with koa-onerror

circle.yml

@@ -1,6 +1,6 @@
 machine:
   node:
-    version: 7.6
+    version: 8.0
   services:
     - redis
   environment:

package.json

@@ -54,7 +54,7 @@
     ]
   },
   "engines": {
-    "node": ">= 7.6"
+    "node": ">= 8.0"
   },
   "repository": {
     "type": "git",
@@ -125,6 +125,7 @@
     "koa-jwt": "^3.2.1",
     "koa-logger": "^2.0.1",
     "koa-mount": "^3.0.0",
+    "koa-onerror": "^4.0.0",
     "koa-router": "7.0.1",
     "koa-sendfile": "2.0.0",
     "koa-static": "^4.0.1",

server/index.js

@@ -5,6 +5,7 @@ import logger from 'koa-logger';
 import mount from 'koa-mount';
 import Koa from 'koa';
 import bugsnag from 'bugsnag';
+import onerror from 'koa-onerror';
 import updates from './utils/updates';
 
 import api from './api';
@@ -65,17 +66,17 @@ if (process.env.NODE_ENV === 'development') {
     )
   );
   app.use(logger());
-}
 
-if (process.env.NODE_ENV === 'production' && process.env.BUGSNAG_KEY) {
-  bugsnag.register(process.env.BUGSNAG_KEY, {
-    filters: ['authorization'],
-  });
-  app.on('error', bugsnag.koaHandler);
-}
-
-if (process.env.NODE_ENV === 'development') {
   app.use(mount('/emails', emails));
+} else if (process.env.NODE_ENV === 'production') {
+  onerror(app);
+
+  if (process.env.BUGSNAG_KEY) {
+    bugsnag.register(process.env.BUGSNAG_KEY, {
+      filters: ['authorization'],
+    });
+    app.on('error', bugsnag.koaHandler);
+  }
 }
 
 app.use(mount('/api', api));

yarn.lock

@@ -5636,6 +5636,10 @@ koa-mount@^3.0.0:
     debug "^2.6.1"
     koa-compose "^3.2.1"
 
+koa-onerror@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/koa-onerror/-/koa-onerror-4.0.0.tgz#2c1bbf0ac9352e702f161591ddf1e8373716d507"
+
 koa-router@7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/koa-router/-/koa-router-7.0.1.tgz#800a61d0a3342d3d1f96d8c688b84ed2a6314d97"