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

Even fancyer logging

Browse source
This commit is contained in:
YourFriendlyNeighborhoodDealer 2018-11-23 09:18:53 +01:00
parent 95a6ab88d0
commit 11a6150d3a
2 changed files with 22 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

26
actions.js
View file

@ -32,32 +32,36 @@ var logger = require('./logger.js');
var utils = require('./utils.js'); var utils = require('./utils.js');
function Process(d, file) { function Process(d, file) {
logger.Log("[PCES]:\tFile: " + file);
try { try {
logger.Log("[PCES]:\tFile: " + file);
if (d.data.split("\n").length > 1) { if (d.data.split("\n").length > 1) {
var oldFile = utils.ReadFile(file); var oldFile = utils.ReadFile(file);
var newFile = oldFile + "\n+" + d.data; var newFile = oldFile + "\n";
if (d.data[0] == '+')
newFile += d.data;
else
newFile += "+" + d.data;
var newRes = CheckData(newFile); var newRes = CheckData(newFile);
var oldRes = CheckData(oldFile); var oldRes = CheckData(oldFile);
if (newRes.count > 0) if (newRes.count > 0)
logger.Log("[NLOD]:\tnew file result: " + newRes.count, logger.GetColor("blue")); logger.Log("[NLOD]:\t\tnew file result: " + newRes.count, logger.GetColor("blue"));
else else
logger.Log("[NLOD]:\tnew file NLOD error, " + newRes.log, logger.GetColor("redbg"), true); logger.Log("[NLOD]:\t\tnew file NLOD error, " + newRes.log, logger.GetColor("redbg"), true);
if (oldRes.count > 0) if (oldRes.count > 0)
logger.Log("[NLOD]:\told public result: " + oldRes.count, logger.GetColor("blue")); logger.Log("[NLOD]:\t\told public result: " + oldRes.count, logger.GetColor("blue"));
else else
logger.Log("[NLOD]:\told public NLOD error, " + oldRes.log, logger.GetColor("redbg"), true); logger.Log("[NLOD]:\t\told public NLOD error, " + oldRes.log, logger.GetColor("redbg"), true);
utils.WriteFile(newFile, file); utils.WriteFile(newFile, file);
logger.Log("[NLOD]:\tNew data written to: " + file); logger.Log("[NLOD]:\t\tNew data written to: " + file);
return newRes.count - oldRes.count; return newRes.count - oldRes.count;
} } else
logger.Log("[PCES]:\t\tNo new data");
} catch (e) { } catch (e) {
Beep(); Beep();
@ -78,7 +82,7 @@ function ProcessIncomingRequest(data) {
var d = SetupData(data); var d = SetupData(data);
logger.Log("[PCES]:\tProcessing data: " + d.subj + " (" + d.type + ")"); logger.Log("[PCES]:\tProcessing data: " + d.subj + " (" + d.type + ")", logger.GetColor("green"));
if (d.subj == undefined){ if (d.subj == undefined){
logger.Log(JSON.stringify(d), logger.GetColor("red")); logger.Log(JSON.stringify(d), logger.GetColor("red"));
return; return;

13
server.js
View file

@ -67,10 +67,6 @@ var newMessages = "";
app.set('view engine', 'ejs'); app.set('view engine', 'ejs');
app.use(function(req, res, next) { app.use(function(req, res, next) {
res.on('finish', function() { res.on('finish', function() {
if (res.statusCode != 404 && req.connection.remoteAddress != "::1"){
// Log(req);
}
else
Log(req, true); Log(req, true);
}); });
stat.Inc(req.url); stat.Inc(req.url);
@ -188,6 +184,7 @@ app.get('/postfeedback', function(req, res) {
app.post('/isAdding', function(req, res) { app.post('/isAdding', function(req, res) {
res.end('OK'); res.end('OK');
Log(req);
actions.ProcessIncomingRequest(req.body.datatoadd); actions.ProcessIncomingRequest(req.body.datatoadd);
utils.WriteBackup(); utils.WriteBackup();
}); });
@ -261,9 +258,11 @@ function Log(req, toFile) {
if (!toFile) { if (!toFile) {
logger.Log(logEntry, color); logger.Log(logEntry, color);
} else { } else {
utils.AppendToFile(logger.GetDateString() + ": " + logEntry + "\n\t" + JSON.stringify(req.headers) + var defLogs = logger.GetDateString() + ": " + logEntry;
"\n\t" + JSON.stringify(req var extraLogs = "\n\t" + JSON.stringify(req.headers) + "\n\t" + JSON.stringify(req
.body) + "\n", logFile); .body) + "\n";
utils.AppendToFile(defLogs, logFile);
} }
} catch (e) { } catch (e) {