From 373cb4db71bf12500c0182b0cc2d9fa834bad4f7 Mon Sep 17 00:00:00 2001
From: mrfry <mrfry@airmail.cc>
Date: Tue, 16 Feb 2021 10:56:42 +0100
Subject: [PATCH] logging improvements

---
 scripts/serverStats.sh               | 1 +
 src/modules/api/api.ts               | 2 +-
 src/modules/dataEditor/dataEditor.ts | 7 ++++++-
 src/modules/qmining/qmining.ts       | 8 ++++++--
 submodules/qmining-page              | 2 +-
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/scripts/serverStats.sh b/scripts/serverStats.sh
index eee6d5f..8e5893c 100755
--- a/scripts/serverStats.sh
+++ b/scripts/serverStats.sh
@@ -110,6 +110,7 @@ function jsonStats() {
     -e "s,/avaiblePWS,${C}&${NC},g" \
     -e "s,/pwRequest,${C}&${NC},g" \
     -e "s,/login,${C}&${NC},g" \
+    -e "s,/logout,${C}&${NC},g" \
     -e "s,/manual,${G}&${NC},g" \
     -e "s,/todos,${G}&${NC},g" \
     -e "s,/allQuestions,${G}&${NC},g" \
diff --git a/src/modules/api/api.ts b/src/modules/api/api.ts
index 69c8cf0..5b6f200 100644
--- a/src/modules/api/api.ts
+++ b/src/modules/api/api.ts
@@ -469,7 +469,7 @@ function GetApp(): ModuleType {
       }
     }
 
-    logger.Log(`Vote from #${user.id}: ${key}: ${val}`, logger.GetColor('blue'))
+    logger.Log(`Vote from #${user.id}: ${key}: ${val}`, logger.GetColor('bluebg'))
     res.render('votethank', {
       result: prevVote ? 'already voted' : 'success',
       prevVote: prevVote,
diff --git a/src/modules/dataEditor/dataEditor.ts b/src/modules/dataEditor/dataEditor.ts
index 1427f08..375e4c5 100644
--- a/src/modules/dataEditor/dataEditor.ts
+++ b/src/modules/dataEditor/dataEditor.ts
@@ -57,6 +57,12 @@ function GetApp(): ModuleType {
       exceptions: ['/favicon.ico', '/getVeteranPw'],
     })
   )
+  app.use((req: Request, res, next) => {
+    if (req.url.includes('.html')) {
+      logger.LogReq(req)
+    }
+    next()
+  })
   publicdirs.forEach((pdir) => {
     logger.Log(`Using public dir: ${pdir}`)
     app.use(express.static(pdir))
@@ -84,7 +90,6 @@ function GetApp(): ModuleType {
     routes.forEach((route) => {
       logger.DebugLog(`Added route /${route}`, 'DataEditor routes', 1)
       app.get(`/${route}`, function(req: Request, res) {
-        logger.LogReq(req)
         res.redirect(`${route}.html`)
       })
     })
diff --git a/src/modules/qmining/qmining.ts b/src/modules/qmining/qmining.ts
index 0002c8d..da86ba6 100644
--- a/src/modules/qmining/qmining.ts
+++ b/src/modules/qmining/qmining.ts
@@ -65,6 +65,12 @@ function GetApp(): ModuleType {
       ],
     })
   )
+  app.use((req: Request, res, next) => {
+    if (req.url.includes('.html')) {
+      logger.LogReq(req)
+    }
+    next()
+  })
   publicdirs.forEach((pdir) => {
     logger.Log(`Using public dir: ${pdir}`)
     app.use(express.static(pdir))
@@ -77,7 +83,6 @@ function GetApp(): ModuleType {
       },
     })
   )
-
   let donateURL = ''
   const donateURLFile = './data/donateURL'
 
@@ -207,7 +212,6 @@ function GetApp(): ModuleType {
     routes.forEach((route) => {
       logger.DebugLog(`Added route /${route}`, 'Qmining routes', 1)
       app.get(`/${route}`, function(req: Request, res) {
-        logger.LogReq(req)
         res.redirect(
           utils.formatUrl({
             pathname: `${route}.html`,
diff --git a/submodules/qmining-page b/submodules/qmining-page
index ca12511..0e59785 160000
--- a/submodules/qmining-page
+++ b/submodules/qmining-page
@@ -1 +1 @@
-Subproject commit ca12511e6da6ff161ab5b63d7ccf5a45145c9333
+Subproject commit 0e59785c3cb79b350a96b5ca6b66cd47c745e5d9