From 7284358121516d2b631ea4a30fbceb532f92451a Mon Sep 17 00:00:00 2001 From: YourFriendlyNeighborhoodDealer <3167982-YourFriendlyNeighborhoodDealer@users.noreply.gitlab.com> Date: Mon, 3 Dec 2018 10:08:19 +0100 Subject: [PATCH] Added motd support, and minor logging improvements --- actions.js | 10 +++++----- server.js | 9 +++++++-- todos | 1 + 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/actions.js b/actions.js index da5fd25..de333d7 100755 --- a/actions.js +++ b/actions.js @@ -45,16 +45,16 @@ function Process(d, file) { var newRes = CheckData(newFile); var oldRes = CheckData(oldFile); - if (newRes.count > 0) - logger.Log("[NLOD]:\t\tnew file result: " + newRes.count, logger.GetColor("blue")); - else - logger.Log("[NLOD]:\t\tnew file NLOD error, " + newRes.log, logger.GetColor("redbg"), true); - if (oldRes.count > 0) logger.Log("[NLOD]:\t\told public result: " + oldRes.count, logger.GetColor("blue")); else logger.Log("[NLOD]:\t\told public NLOD error, " + oldRes.log, logger.GetColor("redbg"), true); + if (newRes.count > 0) + logger.Log("[NLOD]:\t\tnew file result: " + newRes.count, logger.GetColor("blue")); + else + logger.Log("[NLOD]:\t\tnew file NLOD error, " + newRes.log, logger.GetColor("redbg"), true); + utils.WriteFile(newFile, file); logger.Log("[NLOD]:\t\tNew data written to: " + file); diff --git a/server.js b/server.js index ec26b4f..9b4edb4 100755 --- a/server.js +++ b/server.js @@ -32,6 +32,7 @@ var stat = require('./stat.js'); var bodyParser = require('body-parser'); const recivedFiles = "public/recivedfiles"; +const motdFile = "public/motd"; const publicFile = "public/data/public"; const staticFile = "public/data/static"; const countFile = "public/data/count"; @@ -101,12 +102,16 @@ app.get('/manual', function(req, res) { }); app.get('/public', function(req, res) { - res.write(utils.ReadFile(publicFile)); + var response = '@' + utils.ReadFile(motdFile); + response += utils.ReadFile(publicFile); + res.write(response); res.end(); }); app.get('/static', function(req, res) { - res.write(utils.ReadFile(staticFile)); + var response = '@' + utils.ReadFile(motdFile); + response += utils.ReadFile(staticFile); + res.write(response); res.end(); }); diff --git a/todos b/todos index 7d3e8f5..868d31d 100644 --- a/todos +++ b/todos @@ -1,2 +1,3 @@ make init function that creates directory and file structure +remove public questions