diff --git a/server.js b/server.js index c59d84b..de0c5e3 100644 --- a/server.js +++ b/server.js @@ -65,6 +65,19 @@ let modules = { const app = express() +app.use(function (req, res, next) { + res.on('finish', function () { + logger.LogReq(req, true, res.statusCode) + let toLog = loggableKeywords.some((x) => { + return req.url.includes(x) + }) + if (toLog) { logger.LogReq(req) } + if (res.statusCode !== 404) { stat.LogStat(req.url) } + }) + next() +}) + + Object.keys(modules).forEach(function (k, i) { let x = modules[k] try { @@ -132,18 +145,6 @@ function setLogTimer () { setLogTimer() -app.use(function (req, res, next) { - res.on('finish', function () { - logger.LogReq(req, true, res.statusCode) - let toLog = loggableKeywords.some((x) => { - return req.url.includes(x) - }) - if (toLog) { logger.LogReq(req) } - if (res.statusCode !== 404) { stat.LogStat(req.url) } - }) - next() -}) - logger.Log('Node version: ' + process.version) logger.Log('Listening on port: ' + port) diff --git a/utils/logger.js b/utils/logger.js index c3e7a25..45e224b 100644 --- a/utils/logger.js +++ b/utils/logger.js @@ -41,6 +41,11 @@ const colors = [ 'cyan' ] +let noLogips = utils.ReadFile('./nolog').split('\n') +setInterval(() => { + noLogips = utils.ReadFile('./nolog').split('\n') +}, 1000 * 60 * 30) + function GetDateString () { const m = new Date() const d = m.getFullYear() + '/' + @@ -64,6 +69,13 @@ function LogReq (req, toFile, sc) { try { let ip = req.headers['cf-connecting-ip'] || req.connection.remoteAddress + let nolog = noLogips.some((x) => { + return x.includes(ip) + }) + if (nolog) { + return + } + let logEntry = GetRandomColor(ip) + ip + C() let dl = DELIM if (req.url.includes('lred')) { diff --git a/views/stuff/folders.ejs b/views/stuff/folders.ejs index e0f61f5..bf68650 100644 --- a/views/stuff/folders.ejs +++ b/views/stuff/folders.ejs @@ -88,7 +88,7 @@ <%=folders[i].mtime %> - <%=folders[i].size %> MB + <%= folders[i].size === 0 ? "Dir" : folders[i].size + 'MB' %>