Add loggable representation to HttpError

hatsyjs · Nov 8, 2020 · 47385d9 · 47385d9
1 parent f773098
commit 47385d9
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 15 deletions.
diff --git a/src/http/http-error.ts b/src/http/http-error.ts
@@ -44,6 +44,26 @@ export class HttpError extends Error {
     this.reason = options.reason;
   }
 
+  /**
+   * Constructs loggable error representation.
+   *
+   * Returns an array containing error message, details, and reason.
+   */
+  toLog(): any[] {
+
+    const report: any[] = [this.message];
+    const { details, reason } = this;
+
+    if (details) {
+      report.push(details);
+    }
+    if (reason) {
+      report.push(reason);
+    }
+
+    return report;
+  }
+
 }
 
 function httpErrorMessage(

diff --git a/src/http/http-listener.ts b/src/http/http-listener.ts
@@ -266,27 +266,16 @@ function httpErrorHandler<TExt, TRequest extends IncomingMessage, TResponse exte
  * @internal
  */
 function logHttpError(
-    { request, log, error }: RequestContext<HttpMeans & ErrorMeans & LoggerMeans>,
+    { request: { method, url }, log, error }: RequestContext<HttpMeans & ErrorMeans & LoggerMeans>,
 ): void {
 
-  const report: any[] = [`[${request.method} ${request.url}]`];
+  const prefix = `[${method} ${url}]`;
 
   if (error instanceof HttpError) {
-    report.push(error.message);
-
-    const { details, reason } = error;
-
-    if (details) {
-      report.push(details);
-    }
-    if (reason) {
-      report.push(reason);
-    }
+    log.error(prefix, ...error.toLog());
   } else {
-    report.push(error);
+    log.error(prefix, error);
   }
-
-  log.error(...report);
 }
 
 /**