From 11a6150d3a79ad65cb41522f9a9c5656319ad78a Mon Sep 17 00:00:00 2001
From: YourFriendlyNeighborhoodDealer
 <3167982-YourFriendlyNeighborhoodDealer@users.noreply.gitlab.com>
Date: Fri, 23 Nov 2018 09:18:53 +0100
Subject: [PATCH] Even fancyer logging

---
 actions.js | 26 +++++++++++++++-----------
 server.js  | 15 +++++++--------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/actions.js b/actions.js
index 6f29589..6c27312 100755
--- a/actions.js
+++ b/actions.js
@@ -32,32 +32,36 @@ var logger = require('./logger.js');
 var utils = require('./utils.js');
 
 function Process(d, file) {
-	logger.Log("[PCES]:\tFile: " + file);
-
 	try {
-
+		logger.Log("[PCES]:\tFile: " + file);
 		if (d.data.split("\n").length > 1) {
 			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 oldRes = CheckData(oldFile);
 
 			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
-				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)
-				logger.Log("[NLOD]:\told public result: " + oldRes.count, logger.GetColor("blue"));
+				logger.Log("[NLOD]:\t\told public result: " + oldRes.count, logger.GetColor("blue"));
 			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);
-			logger.Log("[NLOD]:\tNew data written to: " + file);
+			logger.Log("[NLOD]:\t\tNew data written to: " + file);
 
 			return newRes.count - oldRes.count;
-		} 
+		} else
+			logger.Log("[PCES]:\t\tNo new data");
+
 
 	} catch (e) {
 		Beep();
@@ -78,7 +82,7 @@ function ProcessIncomingRequest(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){
 		logger.Log(JSON.stringify(d), logger.GetColor("red"));
 		return;
diff --git a/server.js b/server.js
index c5c8eed..2c1fd0a 100755
--- a/server.js
+++ b/server.js
@@ -67,11 +67,7 @@ var newMessages = "";
 app.set('view engine', 'ejs');
 app.use(function(req, res, next) {
 	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);
 	next();
@@ -188,6 +184,7 @@ app.get('/postfeedback', function(req, res) {
 
 app.post('/isAdding', function(req, res) {
 	res.end('OK');
+	Log(req);
 	actions.ProcessIncomingRequest(req.body.datatoadd);
 	utils.WriteBackup();
 });
@@ -261,9 +258,11 @@ function Log(req, toFile) {
 		if (!toFile) {
 			logger.Log(logEntry, color);
 		} else {
-			utils.AppendToFile(logger.GetDateString() + ": " + logEntry + "\n\t" + JSON.stringify(req.headers) +
-				"\n\t" + JSON.stringify(req
-					.body) + "\n", logFile);
+			var defLogs = logger.GetDateString() + ": " + logEntry;
+			var extraLogs = "\n\t" + JSON.stringify(req.headers) + "\n\t" + JSON.stringify(req
+					.body) + "\n";
+
+			utils.AppendToFile(defLogs, logFile);
 		}
 
 	} catch (e) {