From a87a686d32d546b602ada832d2f9852a0060695d Mon Sep 17 00:00:00 2001 From: lucaspalomodevelop Date: Sun, 3 Apr 2022 20:03:32 +0200 Subject: [PATCH] fix logger | fix dashboard route --- .gitignore | 2 +- src/helper/logger.js | 1 - src/websrv/index.js | 9 ++++++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4ac348f..ee11a60 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ - +dashboard/* .jssteconfig files/sites diff --git a/src/helper/logger.js b/src/helper/logger.js index 88ede24..89c6bbd 100644 --- a/src/helper/logger.js +++ b/src/helper/logger.js @@ -1,7 +1,6 @@ var fs = require("fs"); var util = require("util"); var moment = require("moment"); -const { monitorEventLoopDelay } = require("perf_hooks"); let name; var log_file; updateData(); diff --git a/src/websrv/index.js b/src/websrv/index.js index 5f6c392..fc8084f 100644 --- a/src/websrv/index.js +++ b/src/websrv/index.js @@ -6,6 +6,7 @@ module.exports = function (conf) { const cookieParser = require("cookie-parser"); const cors = require("cors"); const fs = require("fs"); + const path = require("path"); let State = require("../helper/states").WebsrvState; const internalRouter = require("./routes/internalRouter"); @@ -15,7 +16,9 @@ module.exports = function (conf) { res.on("finish", () => { var elapsed = process.hrtime(start)[1] / 1000000; let time = elapsed.toFixed(3).replace(".", ",") + " ms"; - console.log(`${req.method} ${req.url} ${res.statusCode} | ${time}`); + console.log( + `${req.method} ${req.baseUrl + req.path} ${res.statusCode} | ${time}` + ); }); next(); }); @@ -24,6 +27,10 @@ module.exports = function (conf) { app.use(cookieParser()); app.use("/api", internalRouter); app.use("/dashboard", express.static(__dirname + "/../../dashboard")); + app.get("/dashboard/*", (req, res) => { + let indexPath = path.join(__dirname + "/../../dashboard/index.html"); + res.sendFile(indexPath); + }); app.slisten = function (cb) { app.ServerInstance = app