From 756d22e5359ff2cf051e5ab328ade3231be856b5 Mon Sep 17 00:00:00 2001 From: mrfry Date: Mon, 5 Oct 2020 09:10:00 +0200 Subject: [PATCH] Added logrotate #7 --- .eslintrc.js | 2 +- src/server.js | 1 + src/utils/logger.js | 37 ++++++++++++++++++++++++++----------- 3 files changed, 28 insertions(+), 12 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 34be489..aa09437 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -16,6 +16,6 @@ module.exports = { eqeqeq: ['warn', 'smart'], 'no-unused-vars': 'warn', 'no-prototype-builtins': 'off', - 'id-length': ['warn', { exceptions: ['i', 'j', 't', 'Q', 'A'] }], + 'id-length': ['warn', { exceptions: ['i', 'j', 't', 'Q', 'A', 'C'] }], }, } diff --git a/src/server.js b/src/server.js index bf273a0..c40693e 100755 --- a/src/server.js +++ b/src/server.js @@ -250,6 +250,7 @@ function LogTimerAction() { const line = '===================================================================================================================================================' logger.Log(line) + logger.setNewLogfileName() utils.AppendToFile(line, locLogFile) utils.AppendToFile(line, allLogFile) } diff --git a/src/utils/logger.js b/src/utils/logger.js index a5e6167..dae5ea0 100755 --- a/src/utils/logger.js +++ b/src/utils/logger.js @@ -32,14 +32,14 @@ module.exports = { logHashed: logHashed, hr: hr, C: C, + setNewLogfileName, } const DELIM = C('green') + '|' + C() const utils = require('../utils/utils.js') -const locLogFile = './stats/logs' -const logFile = '/nlogs/nlogs' -const allLogFile = '/nlogs/log' +const vlogDir = './stats/vlogs/' +const logDir = './stats/logs/' const statFile = 'stats/stats' const vStatFile = 'stats/vstats' const uStatsFile = 'stats/ustats' @@ -47,6 +47,7 @@ const uvStatsFile = 'stats/uvstats' const nologFile = './nolog' const colors = ['green', 'red', 'yellow', 'blue', 'magenta', 'cyan'] +let logFileName = getDayString() const writeInterval = 10 const debugLevel = parseInt(process.env.NS_LOGLEVEL) || 0 @@ -60,10 +61,25 @@ let writes = 0 let noLogips = [] +function setNewLogfileName() { + logFileName = getDayString() +} + +function getDayString() { + const date = new Date() + return ( + date.getFullYear() + + '_' + + ('0' + (date.getMonth() + 1)).slice(-2) + + '_' + + ('0' + date.getDate()).slice(-2) + ) +} + function GetDateString() { - const m = new Date() - const d = utils.GetDateString() - return GetRandomColor(m.getHours().toString()) + d + C() + const date = new Date() + const dateString = utils.GetDateString() + return GetRandomColor(date.getHours().toString()) + dateString + C() } function DebugLog(msg, name, lvl) { @@ -93,7 +109,7 @@ function Log(s, c) { } console.log(log) - utils.AppendToFile(log, logFile) + utils.AppendToFile(log, logDir + logFileName) } function LogReq(req, toFile, sc) { @@ -146,11 +162,10 @@ function LogReq(req, toFile, sc) { } else { let defLogs = GetDateString() + dl + logEntry - utils.AppendToFile(defLogs, locLogFile) - utils.AppendToFile(defLogs, allLogFile) + utils.AppendToFile(defLogs, vlogDir + logFileName) } - } catch (e) { - console.log(e) + } catch (err) { + console.log(err) Log('Error at logging lol', GetColor('redbg'), true) } }