albert/mrfrys-node-server
1
0
Fork 0
mirror of https://gitlab.com/MrFry/mrfrys-node-server synced 2025-04-01 20:24:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Major logging changes

Browse source
This commit is contained in:
YourFriendlyNeighborhoodDealer 2019-03-24 10:06:28 +01:00
parent fbf5a99cfd
commit fde527aaeb
5 changed files with 83 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

61
server.js
View file

@ -44,7 +44,6 @@ const simpOutFile = "public/simplified";
const inputFile = "stats/inputs";
const msgFile = "stats/msgs";
const logFile = "stats/logs";
const allLogFile = "/nlogs/log";
// https://certbot.eff.org/
@ -77,7 +76,7 @@ const httpsPort = 8443;
app.set('view engine', 'ejs');
app.use(function(req, res, next) {
res.on('finish', function() {
Log(req, true, res.statusCode);
logger.LogReq(req, true, res.statusCode);
if (res.statusCode != 404)
stat.LogStat(req.url);
});
@ -114,7 +113,7 @@ app.get('/sio', function(req, res) {
app.get('/manual', function(req, res) {
res.write(utils.ReadFile(manFile));
res.end();
Log(req);
logger.LogReq(req);
});
app.get('/public', function(req, res) {
@ -147,12 +146,12 @@ app.get('/legacy', function(req, res) {
siteurl: siteUrl
});
Log(req);
logger.LogReq(req);
});
app.post('/postfeedback', function(req, res) {
res.redirect('back');
logger.Log("[UMSG]: New feedback message", logger.GetColor("bluebg"), true);
logger.Log("New feedback message", logger.GetColor("bluebg"), true);
utils.AppendToFile("\n\n" + logger.GetDateString() + ": " + req.body.message_field, msgFile);
});
@ -166,7 +165,7 @@ app.get('/postfeedback', function(req, res) {
app.post('/isAdding', function(req, res) {
res.end('OK');
Log(req);
logger.LogReq(req);
actions.ProcessIncomingRequest(req.body.datatoadd);
utils.WriteBackup();
});
@ -174,19 +173,19 @@ app.post('/isAdding', function(req, res) {
app.get('/lred', function(req, res) {
res.redirect("/legacy");
res.end();
Log(req);
logger.LogReq(req);
});
app.get('/menuClick', function(req, res) {
res.redirect("/");
res.end();
Log(req);
logger.LogReq(req);
});
app.get('/irc', function(req, res) {
res.redirect(ircURL);
res.end();
Log(req);
logger.LogReq(req);
});
// all questions readable
@ -197,32 +196,32 @@ app.get('/allqr', function(req, res) {
res.render('allqr', {
d: d.toString().split('\n')
});
Log(req);
logger.LogReq(req);
});
app.get('/greasy', function(req, res) {
res.redirect("https://greasyfork.org/en/scripts/38999-moodle-elearning-kmooc-test-help");
res.end();
Log(req);
logger.LogReq(req);
});
app.get('/scriptgit', function(req, res) {
res.redirect("https://gitlab.com/YourFriendlyNeighborhoodDealer/moodle-test-userscript");
res.end();
Log(req);
logger.LogReq(req);
});
app.get('/servergit', function(req, res) {
res.redirect("https://gitlab.com/YourFriendlyNeighborhoodDealer/question-node-server");
res.end();
Log(req);
logger.LogReq(req);
});
function UploadFile(req, res, path, next) {
var fstream;
req.pipe(req.busboy);
req.busboy.on('file', function(fieldname, file, filename) {
logger.Log("[UPL]: Uploading: " + filename, logger.GetColor("blue"));
logger.Log("Uploading: " + filename, logger.GetColor("blue"));
utils.CreatePath(path, true);
let d = new Date();
@ -233,7 +232,7 @@ function UploadFile(req, res, path, next) {
fstream = fs.createWriteStream(path + "/" + fn);
file.pipe(fstream);
fstream.on('close', function() {
logger.Log("[UPL]: Upload Finished of " + path + "/" + fn, logger.GetColor("blue"));
logger.Log("Upload Finished of " + path + "/" + fn, logger.GetColor("blue"));
next(fn);
});
fstream.on('error', function(err) {
@ -253,7 +252,7 @@ app.route('/badtestsender').post(function(req, res, next) {
UploadFile(req, res, recivedFiles, (fn) => {
res.render("uploaded");
});
Log(req);
logger.LogReq(req);
});
app.get('*', function(req, res) {
@ -282,32 +281,4 @@ if (startHTTPS && certsLoaded) {
logger.Log("Cert files does not exists, starting http only!", logger.GetColor("redbg"));
}
logger.Log(msg, logger.GetColor("yellow"));
logger.Log("[STRT]: Node version: " + process.version);
function Log(req, toFile, sc) {
try {
var ip = req.headers['cf-connecting-ip'] || req.connection.remoteAddress;
var logEntry = "[RSND]: " + ip + ", " + req.headers['user-agent'] +
" " + req.method + " ";
if (sc != undefined && sc == 404)
logEntry += sc + " ";
logEntry += req.url;
var color = logger.GetColor("green");
if (req.url.toLowerCase().includes("isadding"))
color = logger.GetColor("yellow");
if (!toFile) {
logger.Log(logEntry, color);
} else {
var defLogs = logger.GetDateString() + ": " + logEntry;
var extraLogs = "\n\t" + JSON.stringify(req.headers) + "\n\t" + JSON.stringify(req
.body) + "\n";
utils.AppendToFile(defLogs, logFile);
utils.AppendToFile(defLogs, allLogFile);
}
} catch (e) {
logger.Log("Error at logging lol", logger.GetColor("redbg"), true);
}
}
logger.Log("Node version: " + process.version);