From 8ecf2f40b75e7bbb2b07a6f0ce30379423c81d86 Mon Sep 17 00:00:00 2001
From: lucaspalomodevelop <lucas.palomo@t-online.de>
Date: Thu, 10 Mar 2022 20:10:27 +0100
Subject: [PATCH] add express logging

---
 src/helper/logger.js                |  2 +-
 src/index.js                        |  2 +-
 src/websrv/index.js                 | 96 +++++++++++++++--------------
 src/websrv/routes/internalRouter.js |  1 -
 test/core.render.test.js            |  1 -
 5 files changed, 53 insertions(+), 49 deletions(-)

diff --git a/src/helper/logger.js b/src/helper/logger.js
index b1e3b9a..f295456 100644
--- a/src/helper/logger.js
+++ b/src/helper/logger.js
@@ -19,10 +19,10 @@ console.log = function (d) {
   log_file.write(d);
   log_stdout.write(d);
 };
+console.error = console.log;
 
 function getCurrentlog() {
   return fs.readFileSync(__dirname + "/../../logs/" + name, "utf8").toString();
-  // .replace(/\n/g, "<br>");
 }
 
 module.exports = { getCurrentlog };
diff --git a/src/index.js b/src/index.js
index 5b4c149..2d5b189 100644
--- a/src/index.js
+++ b/src/index.js
@@ -15,7 +15,7 @@ websrv.slisten((host, port) => {
  * Stops the server
  */
 process.on("SIGINT", () => {
-  console.log("\nWeb-Server Beenden ...");
+  console.log("Web-Server Beenden ...");
   websrv.close();
   process.exit();
 });
diff --git a/src/websrv/index.js b/src/websrv/index.js
index 065beb4..2d89e3e 100644
--- a/src/websrv/index.js
+++ b/src/websrv/index.js
@@ -1,45 +1,51 @@
-module.exports = function (conf) {
-  const websrvConfig = conf.webserver;
-  const express = require("express");
-  const app = express();
-  const bodyParser = require("body-parser");
-  const cookieParser = require("cookie-parser");
-  const cors = require("cors");
-  const fs = require("fs");
-  let State = require("../helper/states").WebsrvState;
-
-  const internalRouter = require("./routes/internalRouter");
-
-  app.use(cors());
-  app.use(bodyParser.json());
-  app.use(cookieParser());
-
-  app.use("/api", internalRouter);
-
-  app.slisten = function (cb) {
-    app.ServerInstance = app
-      .listen(websrvConfig.port, websrvConfig.host, () => {
-        State.status = 0;
-        State.statusMSG = "webserver is running";
-        State.port = websrvConfig.port;
-        cb(websrvConfig.host, websrvConfig.port);
-      })
-      .on("error", (err) => {
-        State.status = 1;
-        State.statusMSG = "webserver could not started";
-        console.log(err);
-      });
-  };
-
-  /**
-   * @function
-   * @name close
-   * @description
-   * Stops the server
-   */
-  app.close = function () {
-    app.ServerInstance.close();
-  };
-
-  return app;
-};
+module.exports = function (conf) {
+  const websrvConfig = conf.webserver;
+  const express = require("express");
+  const app = express();
+  const bodyParser = require("body-parser");
+  const cookieParser = require("cookie-parser");
+  const cors = require("cors");
+  const fs = require("fs");
+  let State = require("../helper/states").WebsrvState;
+
+  const internalRouter = require("./routes/internalRouter");
+
+  app.use((req, res, next) => {
+    res.on("finish", () => {
+      console.log(`${req.method} ${req.url} ${res.statusCode}`);
+    });
+    next();
+  });
+  app.use(cors());
+  app.use(bodyParser.json());
+  app.use(cookieParser());
+  app.use("/api", internalRouter);
+  app.use("/dashboard", express.static(__dirname + "/../../dashboard"));
+
+  app.slisten = function (cb) {
+    app.ServerInstance = app
+      .listen(websrvConfig.port, websrvConfig.host, () => {
+        State.status = 0;
+        State.statusMSG = "webserver is running";
+        State.port = websrvConfig.port;
+        cb(websrvConfig.host, websrvConfig.port);
+      })
+      .on("error", (err) => {
+        State.status = 1;
+        State.statusMSG = "webserver could not started";
+        console.log(err);
+      });
+  };
+
+  /**
+   * @function
+   * @name close
+   * @description
+   * Stops the server
+   */
+  app.close = function () {
+    app.ServerInstance.close();
+  };
+
+  return app;
+};
diff --git a/src/websrv/routes/internalRouter.js b/src/websrv/routes/internalRouter.js
index 71f7714..e658217 100644
--- a/src/websrv/routes/internalRouter.js
+++ b/src/websrv/routes/internalRouter.js
@@ -5,7 +5,6 @@ const States = require("../../helper/states");
 const logger = require("../../helper/logger");
 
 router.get("/conf", (req, res) => {
-  console.log(conf);
   res.json(conf);
 });
 
diff --git a/test/core.render.test.js b/test/core.render.test.js
index 44e4af1..ad1b43e 100644
--- a/test/core.render.test.js
+++ b/test/core.render.test.js
@@ -57,7 +57,6 @@ function test() {
         </body>
         </html>`
       );
-      console.log(result);
     });
 
     it("should not rendern _VAR_", function () {