From 66a7cf73d8434958734f6ce5ee4d712c3eb892dd Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Fri, 20 Aug 2021 02:21:02 -0400
Subject: [PATCH] Let Express log HTTP handler errors

Express already comes with a built-in error handler that is attached
as the last middleware. Any handler or middleware can pass an Error
object (with an optional `.status` or `.statusCode` property set to a
4xx or 5xx code) to `next()` and Express will both log a detailed
error message and display a useful error message to the user. For more
details see "The default error handler" at:
https://expressjs.com/en/guide/error-handling.html
---
 src/ep.json                             |  6 ------
 src/node/hooks/express/errorhandling.js | 16 ----------------
 2 files changed, 22 deletions(-)
 delete mode 100644 src/node/hooks/express/errorhandling.js

diff --git a/src/ep.json b/src/ep.json
index 5642f8c12..a8f26327a 100644
--- a/src/ep.json
+++ b/src/ep.json
@@ -74,12 +74,6 @@
         "expressCreateServer": "ep_etherpad-lite/node/hooks/express/importexport"
       }
     },
-    {
-      "name": "errorhandling",
-      "hooks": {
-        "expressCreateServer": "ep_etherpad-lite/node/hooks/express/errorhandling"
-      }
-    },
     {
       "name": "socketio",
       "hooks": {
diff --git a/src/node/hooks/express/errorhandling.js b/src/node/hooks/express/errorhandling.js
deleted file mode 100644
index b395f4606..000000000
--- a/src/node/hooks/express/errorhandling.js
+++ /dev/null
@@ -1,16 +0,0 @@
-'use strict';
-
-exports.expressCreateServer = (hook_name, args, cb) => {
-  exports.app = args.app;
-
-  // Handle errors
-  args.app.use((err, req, res, next) => {
-    // if an error occurs Connect will pass it down
-    // through these "error-handling" middleware
-    // allowing you to respond however you like
-    res.status(500).send({error: 'Sorry, something bad happened!'});
-    console.error(err.stack ? err.stack : err.toString());
-  });
-
-  return cb();
-};