From 59640eaddfa7a7817cef06ba6adef33cd337fb78 Mon Sep 17 00:00:00 2001 From: YourFriendlyNeighborhoodDealer Date: Wed, 27 Feb 2019 18:58:29 +0100 Subject: [PATCH] Added logging to accesible folder, and made all questions page more readable --- README.md | 0 actions.js | 1 - license | 0 logger.js | 4 ++ merger.js | 0 motd.js | 0 public/favicon.ico | Bin public/man.html | 0 server.js | 20 ++++----- stat.js | 0 utils.js | 6 ++- views/404.ejs | 0 views/alldata.ejs | 107 +++++++++++++++++++++++++++++++++++++++++++++ views/main.ejs | 4 +- views/uload.ejs | 22 ++++++++++ views/uploaded.ejs | 0 16 files changed, 149 insertions(+), 15 deletions(-) mode change 100755 => 100644 README.md mode change 100755 => 100644 actions.js mode change 100755 => 100644 license mode change 100755 => 100644 logger.js mode change 100755 => 100644 merger.js mode change 100755 => 100644 motd.js mode change 100755 => 100644 public/favicon.ico mode change 100755 => 100644 public/man.html mode change 100755 => 100644 server.js mode change 100755 => 100644 stat.js mode change 100755 => 100644 utils.js mode change 100755 => 100644 views/404.ejs create mode 100644 views/alldata.ejs mode change 100755 => 100644 views/main.ejs create mode 100644 views/uload.ejs mode change 100755 => 100644 views/uploaded.ejs diff --git a/README.md b/README.md old mode 100755 new mode 100644 diff --git a/actions.js b/actions.js old mode 100755 new mode 100644 index e549cac..00792f0 --- a/actions.js +++ b/actions.js @@ -279,7 +279,6 @@ function ProcessIncomingRequest(data) { data.AddQuestion(d.subj, q); } - data.version = version; logger.Log("[PCES]:\t" + d.subj); var msg = "All / new count: " + allQuestions.length + " / " + questions.length; if (d.version != undefined) diff --git a/license b/license old mode 100755 new mode 100644 diff --git a/logger.js b/logger.js old mode 100755 new mode 100644 index 6a98459..2ae4886 --- a/logger.js +++ b/logger.js @@ -26,6 +26,8 @@ module.exports = { var utils = require('./utils.js'); const nlogFile = "stats/nlogs"; +const varLogFile = "/var/log/qminingNLog"; +const logFile = "/nlogs/nlogs"; function GetDateString() { var m = new Date(); @@ -45,7 +47,9 @@ function Log(s, c, b) { if (b) utils.Beep(); + utils.AppendToFile(GetDateString() + "> " + s, nlogFile); + utils.AppendToFile(GetDateString() + "> " + s, logFile); } function GetColor(c) { diff --git a/merger.js b/merger.js old mode 100755 new mode 100644 diff --git a/motd.js b/motd.js old mode 100755 new mode 100644 diff --git a/public/favicon.ico b/public/favicon.ico old mode 100755 new mode 100644 diff --git a/public/man.html b/public/man.html old mode 100755 new mode 100644 diff --git a/server.js b/server.js old mode 100755 new mode 100644 index cdf62aa..39f7287 --- a/server.js +++ b/server.js @@ -45,6 +45,8 @@ const inputFile = "stats/inputs"; const msgFile = "stats/msgs"; const logFile = "stats/logs"; +const allLogFile = "/nlogs/log"; + // https://certbot.eff.org/ const privkeyFile = "/etc/letsencrypt/live/questionmining.tk/privkey.pem"; const fullchainFile = "/etc/letsencrypt/live/questionmining.tk/fullchain.pem"; @@ -134,17 +136,14 @@ app.get('/static', function(req, res) { }); app.get('/legacy', function(req, res) { - // TODO: make this ejs - var f = utils.ReadFile(dataFile); - var r = ''; - r += ''; - var d = actions.LoadJSON(f).toString().split("\n"); - for (var i = 0; i < d.length; i++) - r += d[i] + "
"; - r += ''; - res.write(r); - res.end(); + var f = utils.ReadFile(dataFile); + var d = actions.LoadJSON(f); + var raw = d.toString().split("\n"); + + res.render('alldata', { + data: d + }); }); app.post('/postfeedback', function(req, res) { @@ -276,6 +275,7 @@ function Log(req, toFile, sc) { .body) + "\n"; utils.AppendToFile(defLogs, logFile); + utils.AppendToFile(defLogs, allLogFile); } } catch (e) { diff --git a/stat.js b/stat.js old mode 100755 new mode 100644 diff --git a/utils.js b/utils.js old mode 100755 new mode 100644 index 35e62ae..81ef830 --- a/utils.js +++ b/utils.js @@ -36,8 +36,10 @@ function CreatePath(path, onlyPath) { var p = path.split("/"); var currDir = p[0]; for (var i = 1; i < p.length; i++) { - if (!fs.existsSync(currDir)) { - fs.mkdirSync(currDir); + if (currDir != "" && !fs.existsSync(currDir)) { + try { + fs.mkdirSync(currDir); + } catch (e) { console.log("Failed to make " + currDir + " directory... "); } } currDir += "/" + p[i]; } diff --git a/views/404.ejs b/views/404.ejs old mode 100755 new mode 100644 diff --git a/views/alldata.ejs b/views/alldata.ejs new file mode 100644 index 0000000..31fe5c9 --- /dev/null +++ b/views/alldata.ejs @@ -0,0 +1,107 @@ + + + + +All questions + + + + +

+Ennek az oldalnak a tartalma dinamikusan frissül minden beküldött kérdés után +

+ +<% for (var i = 0; i < data.Subjects.length; i++) { %> + +
+ <% var a = data.Subjects[i].toString().split('\n')%> + <% for (var j = 1; j < a.length; j++) { %> + <% if (a[j][0] == '?') { %> +
+ <% } %> + <%=a[j] %> +
+ <% } %> +
+ +<% } %> + + + + + diff --git a/views/main.ejs b/views/main.ejs old mode 100755 new mode 100644 index 238839b..1fe162b --- a/views/main.ejs +++ b/views/main.ejs @@ -24,9 +24,9 @@ greasyforkon | Manual | -Összes kérdés (JSON) +Összes kérdés (Olvasható formátum) | -Összes kérdés (Régi/Olvasható formátum) +Összes kérdés (JSON) | Szerver repó | diff --git a/views/uload.ejs b/views/uload.ejs new file mode 100644 index 0000000..9a72173 --- /dev/null +++ b/views/uload.ejs @@ -0,0 +1,22 @@ + + + +Shit uploader + + + + +
+ + +
+ + + diff --git a/views/uploaded.ejs b/views/uploaded.ejs old mode 100755 new mode 100644