Log unhandled errors from next but pass on the error

pablosichert · Oct 26, 2016 · 1aa4355 · 1aa4355
1 parent 5ec3e28
commit 1aa4355
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/src/index.js b/src/index.js
@@ -313,11 +313,14 @@ export default function createLogger(options = {}) {
             print(req(context));
         }
 
+        let exception;
+
         try {
             await next();
         } catch(error) {
-            context.status = 500;
             log.error(error);
+
+            exception = error;
         }
 
         const end = new Date;
@@ -353,7 +356,9 @@ export default function createLogger(options = {}) {
 
         let $status;
 
-        if (status >= 100 && status < 200) {
+        if (exception) {
+            $status = colorize('fatal')('ERR');
+        } else if (status >= 100 && status < 200) {
             $status = colorize('info')(status);
         } else if (status < 300) {
             $status = status;
@@ -377,5 +382,9 @@ export default function createLogger(options = {}) {
         }
 
         slots[slot] = null;
+
+        if (exception) {
+            throw exception;
+        }
     };
 }
diff --git a/...unhandled_error_and_set_status_to_500.log → .../logger_should_log_an_unhandled_error.log b/...unhandled_error_and_set_status_to_500.log → .../logger_should_log_an_unhandled_error.log
@@ -1,4 +1,4 @@
 ──‣ [38;5;59m┈[0m[38;5;59m┈[0m[38;5;59m┈[0m[38;5;59m┈[0m[38;5;59m┈[0m GET[38;5;59m┈[0m ┬ /
                [38;5;196m╎[0m [38;5;196mError[0m
                [38;5;196m╎[0m [38;5;196m    at stack[0m
-[38;5;196m500[0m [38;5;59m┈[0m[38;5;59m┈[0m0ms GET[38;5;59m┈[0m ┴ /
+[38;5;196mERR[0m [38;5;59m┈[0m[38;5;59m┈[0m0ms GET[38;5;59m┈[0m ┴ /
diff --git a/test/index.js b/test/index.js
@@ -257,7 +257,7 @@ describe('logger', () => {
         expect(this.output, 'to equal', fixtures[title]);
     });
 
-    it('should log an unhandled error and set status to 500', async function () {
+    it('should log an unhandled error', async function () {
         const title = this.test.fullTitle();
         const createLogger = this.createLogger(title);
 
@@ -268,14 +268,14 @@ describe('logger', () => {
             originalUrl: '/'
         };
 
-        const next = () => {
-            const error = new Error();
-            error.stack = 'Error\n    at stack';
+        const error = new Error();
+        error.stack = 'Error\n    at stack';
 
+        const next = () => {
             throw error;
         };
 
-        await logger(context, next);
+        await expect(logger(context, next), 'to be rejected with', error);
 
         expect(this.output, 'to equal', fixtures[title]);
     });