From ee77a797363ca8ea4f79cd444c4be1d2bfe1908e Mon Sep 17 00:00:00 2001
From: Dan Janosik <janoside@gmail.com>
Date: Sun, 25 Jul 2021 12:09:54 -0400
Subject: [PATCH] better 404 handling; /address: fix catch issue

---
 app.js               | 15 +++++++++++++--
 routes/baseRouter.js |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app.js b/app.js
index 4f59560..95c502f 100755
--- a/app.js
+++ b/app.js
@@ -846,12 +846,23 @@ expressApp.use(function(req, res, next) {
 
 /// error handlers
 
+const sharedErrorHandler = (err) => {
+	if (err && err.message && err.message.includes("Not Found")) {
+		const path = err.toString().substring(err.toString().lastIndexOf(" ") + 1);
+
+		utils.logError(`NotFound-${path}`, err);
+
+	} else {
+		utils.logError("ExpressUncaughtError", err);
+	}
+};
+
 // development error handler
 // will print stacktrace
 if (expressApp.get("env") === "development" || expressApp.get("env") === "local") {
 	expressApp.use(function(err, req, res, next) {
 		if (err) {
-			utils.logError("3289023yege", err);
+			sharedErrorHandler(err);
 		}
 
 		res.status(err.status || 500);
@@ -866,7 +877,7 @@ if (expressApp.get("env") === "development" || expressApp.get("env") === "local"
 // no stacktraces leaked to user
 expressApp.use(function(err, req, res, next) {
 	if (err) {
-		utils.logError("2309832hcxwgeeew", err);
+		sharedErrorHandler(err);
 	}
 
 	res.status(err.status || 500);
diff --git a/routes/baseRouter.js b/routes/baseRouter.js
index 575a6f5..a107321 100644
--- a/routes/baseRouter.js
+++ b/routes/baseRouter.js
@@ -1644,7 +1644,7 @@ router.get("/address/:address", asyncHandler(async (req, res, next) => {
 		next();
 
 	} catch (e) {
-		res.locals.pageErrors.push(utils.logError("2108hs0gsdfe", err, {address:address}));
+		res.locals.pageErrors.push(utils.logError("2108hs0gsdfe", e, {address:address}));
 
 		res.locals.userMessageMarkdown = `Failed to load address: **${address}**`;