format as error when data.error is populated (#104)

hapijs · Feb 15, 2018 · da92807 · da92807
1 parent 388b0fa
commit da92807
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -164,7 +164,7 @@ class GoodConsole extends Stream.Transform {
 
         tags.unshift(eventName);
 
-        if (eventName === 'error') {
+        if (eventName === 'error' || data.error instanceof Error) {
             return next(null, internals.utility.formatError(data, tags, this._settings));
         }
 
@@ -176,12 +176,6 @@ class GoodConsole extends Stream.Transform {
             return next(null, internals.utility.formatResponse(data, tags, this._settings));
         }
 
-        if (data.data instanceof Error) {
-            const error = data.data;
-
-            return next(null, internals.utility.formatError(Object.assign(data, { error }), tags, this._settings));
-        }
-
         if (!data.data) {
             data.data = '(none)';
         }

diff --git a/test/index.js b/test/index.js
@@ -469,7 +469,7 @@ describe('GoodConsole', () => {
                 reader.pipe(reporter).pipe(out);
 
                 const defaultEvent = Object.assign({}, internals.default);
-                defaultEvent.data = new Error('you logged an error');
+                defaultEvent.error = new Error('you logged an error');
 
                 reader.push(defaultEvent);
                 reader.push(null);