From dee4083bf380c6d53ff7bcdd836ad08c5c46a5d9 Mon Sep 17 00:00:00 2001
From: zadam <adam.zivner@gmail.com>
Date: Thu, 2 Jul 2020 23:15:37 +0200
Subject: [PATCH] improve request logging

---
 src/app.js           | 11 ++---------
 src/routes/routes.js |  6 +-----
 src/services/log.js  |  5 +++--
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/app.js b/src/app.js
index a1e4f92e8..3835aaaed 100644
--- a/src/app.js
+++ b/src/app.js
@@ -23,11 +23,6 @@ app.use(helmet({
     hidePoweredBy: false // deactivated because electron 4.0 crashes on this right after startup
 }));
 
-app.use((req, res, next) => {
-    log.request(req);
-    next();
-});
-
 app.use(bodyParser.json({limit: '500mb'}));
 app.use(bodyParser.urlencoded({extended: false}));
 app.use(cookieParser());
@@ -78,12 +73,10 @@ app.use((req, res, next) => {
 // error handler
 app.use((err, req, res, next) => {
     if (err && err.message && (
-        err.message.includes("Invalid package")
-        || (err.message.includes("Router not found for request") && err.message.includes("node_modules"))
-        || (err.message.includes("Router not found for request") && err.message.includes(".js.map"))
+        (err.message.includes("Router not found for request") && err.message.includes(".js.map"))
         || (err.message.includes("Router not found for request") && err.message.includes(".css.map"))
     )) {
-        // electron 6 outputs a lot of such errors which do not seem important
+        // ignore
     }
     else {
         log.info(err);
diff --git a/src/routes/routes.js b/src/routes/routes.js
index e8b34d505..ee6653930 100644
--- a/src/routes/routes.js
+++ b/src/routes/routes.js
@@ -111,11 +111,7 @@ function route(method, path, middleware, routeHandler, resultHandler, transactio
             res.sendStatus(500);
         }
 
-        const time = Date.now() - start;
-
-        if (time >= 10) {
-            console.log(`Slow request: ${time}ms - ${method} ${path}`);
-        }
+        log.request(req, Date.now() - start);
     });
 }
 
diff --git a/src/services/log.js b/src/services/log.js
index 007d40cef..b4c39e99f 100644
--- a/src/services/log.js
+++ b/src/services/log.js
@@ -64,7 +64,7 @@ function error(message) {
 
 const requestBlacklist = [ "/libraries", "/app", "/images", "/stylesheets" ];
 
-function request(req) {
+function request(req, timeMs) {
     for (const bl of requestBlacklist) {
         if (req.url.startsWith(bl)) {
             return;
@@ -75,7 +75,8 @@ function request(req) {
         return;
     }
 
-    info(req.method + " " + req.url);
+    info((timeMs >= 10 ? "Slow " : "") +
+        req.method + " " + req.url + " took " + timeMs + "ms");
 }
 
 function pad(num) {