From 6efc713539ae0d83b19e40eb3e8afea20a2ec5c1 Mon Sep 17 00:00:00 2001
From: fcaps <alex@fcaps.net>
Date: Sun, 12 Nov 2023 23:24:34 +0100
Subject: [PATCH] enable global error-handler again + some error-logging
 improvements

---
 express.js           |  7 ++++++-
 scripts/extractor.js | 14 +++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/express.js b/express.js
index b2fd2269..ea4401a0 100644
--- a/express.js
+++ b/express.js
@@ -322,7 +322,12 @@ setInterval(() => {
 app.use(function (req, res) {
   res.status(404).render('errors/404');
 });
-app.use(function (req, res) {
+app.use(function (err, req, res, next) {
+  console.error('[error] Incoming request to"', req.originalUrl, '"failed with error "', err.toString(), '"')
+  if (res.headersSent) {
+    return next(err);
+  }
+
   res.status(500).render('errors/500');
 });
  
diff --git a/scripts/extractor.js b/scripts/extractor.js
index 58972599..bd382514 100644
--- a/scripts/extractor.js
+++ b/scripts/extractor.js
@@ -29,7 +29,7 @@ async function getTournamentNews() {
     let newshubData = sortedData.filter(article => article.category[1] !== 284);
     return await newshubData;
   } catch (e) {
-    console.log(e);
+    console.error(currentDate, '- [error] extractor::getTournamentNews failed with =>', e.toString());
     return null;
   }
 }
@@ -52,7 +52,7 @@ async function flashMessage() {
     }));
     return await data;
   } catch (e) {
-    console.log(e);
+    console.error(currentDate, '- [error] extractor::flashMessage failed with =>', e.toString());
     return null;
   }
 }
@@ -72,7 +72,7 @@ async function news() {
     }));
     return await data;
   } catch (e) {
-    console.log(e);
+    console.error(currentDate, '- [error] extractor::news failed with =>', e.toString());
     return null;
   }
 }
@@ -102,7 +102,7 @@ async function newshub() {
     let data = sortedData.filter(onlyActiveArticles);
     return await data;
   } catch (e) {
-    console.log(e);
+    console.error(currentDate, '- [error] extractor::newshub failed with =>', e.toString());
     return null;
   }
 }
@@ -119,7 +119,7 @@ async function fafTeams() {
     }));
     return await data;
   } catch (e) {
-    console.log(e);
+    console.error(currentDate, '- [error] extractor::fafTeams failed with =>', e.toString());
     return null;
   }
 
@@ -135,7 +135,7 @@ async function contentCreators() {
     }));
     return await data;
   } catch (e) {
-    console.log(e);
+    console.error(currentDate, '- [error] extractor::contentCreators failed with =>', e.toString());
     return null;
   }
 
@@ -222,7 +222,7 @@ module.exports.run = function run() {
       .then(data => {
         fs.writeFile(`public/js/app/members/${fileName}.json`, JSON.stringify(data), error => {
           if (error) {
-            console.log(error);
+            console.error(currentDate, '- [error] extractor::run', fileName, 'failed with =>', error.toString());
           } else {
             console.log(`${currentDate} - ${fileName} file created.`);
           }