Merge pull request #266 from toby-wollit/master

Move default error logging behaviour to errorHandler method
moleculerjs · Aug 19, 2021 · 84ce317 · 84ce317
2 parents f708503 + 19d9afd
commit 84ce317
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/src/index.js b/src/index.js
@@ -292,6 +292,21 @@ module.exports = {
 			}
 		},
 
+		/**
+		 * Default error handling behaviour
+		 *
+		 * @param {HttpRequest} req
+		 * @param {HttpResponse} res
+		 * @param {Error} err
+		 */
+		errorHandler(req, res, err) {
+			// don't log client side errors unless it's configured
+			if (this.settings.log4XXResponses || (err && !_.inRange(err.code, 400, 500))) {
+				this.logger.error("   Request error!", err.name, ":", err.message, "\n", err.stack, "\nData:", err.data);
+			}
+			this.sendError(req, res, err);
+		},
+
 		/**
 		 * HTTP request handler. It is called from native NodeJS HTTP server.
 		 *
@@ -340,11 +355,7 @@ module.exports = {
 					this.send404(req, res);
 				}
 			} catch (err) {
-				// don't log client side errors only it's configured
-				if (this.settings.log4XXResponses || (err && !_.inRange(err.code, 400, 500))) {
-					this.logger.error("   Request error!", err.name, ":", err.message, "\n", err.stack, "\nData:", err.data);
-				}
-				this.sendError(req, res, err);
+				this.errorHandler(req, res, err);
 			}
 		},
 

diff --git a/test/unit/service/httpHandler.spec.js b/test/unit/service/httpHandler.spec.js
@@ -13,6 +13,7 @@ const MockContext = () => Object.assign({
 		rest: jest.fn(),
 	},
 	settings: require("../../../src/index").settings,
+	errorHandler: require("../../../src/index").methods.errorHandler,
 	logger: MockLogger(),
 	sendError: jest.fn(),
 	send404: jest.fn(),