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

added bit more advanced file existance checking, removed vhosts in favor or routes

Browse source
This commit is contained in:
mrfry 2023-03-29 19:10:44 +02:00
parent ba89f4a342
commit 113a114821
24 changed files with 2720 additions and 2474 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/utils/logger.ts
View file

@ -26,14 +26,7 @@ const DELIM = C('green') + '|' + C()
// import express from 'express'
import utils from '../utils/utils'
import { Request } from '../types/basicTypes'
const vlogDir = 'stats/vlogs/'
const logDir = 'stats/logs/'
const statFile = 'stats/stats'
const vStatFile = 'stats/vstats'
const uStatsFile = 'stats/ustats'
const uvStatsFile = 'stats/uvstats'
const nologFile = './data/nolog'
import { paths } from './files'
const colors = ['green', 'red', 'yellow', 'blue', 'magenta', 'cyan']
const logFileName = 'log'
@ -93,7 +86,7 @@ function Log(msg: string | object, color?: string): void {
}
utils.AppendToFile(
typeof log === 'string' ? log : JSON.stringify(log),
logDir + logFileName
paths.logDir + logFileName
)
}
@ -156,7 +149,10 @@ function LogReq(
}
logEntry += GetRandomColor(uid.toString()) + uid + C() + dl
logEntry += GetRandomColor(req.url.split('?')[0]) + req.url + C()
logEntry +=
GetRandomColor(req.originalUrl.split('?')[0]) +
req.originalUrl +
C()
if (statusCode !== undefined) {
logEntry += dl + statusCode
@ -168,7 +164,7 @@ function LogReq(
} else {
const defLogs = utils.GetDateString() + dl + logEntry
utils.AppendToFile(defLogs, vlogDir + logFileName)
utils.AppendToFile(defLogs, paths.vlogDir + logFileName)
}
} catch (err) {
console.error(err)
@ -187,17 +183,19 @@ function parseNoLogFile(newData: string) {
}
function setNoLogReadInterval() {
utils.WatchFile(nologFile, (newData: string) => {
utils.WatchFile(paths.nologFile, (newData: string) => {
parseNoLogFile(newData)
Log('No Log user ID-s changed: ' + noLogIds.join(', '))
})
parseNoLogFile(utils.ReadFile(nologFile))
parseNoLogFile(utils.ReadFile(paths.nologFile))
}
function Load(): void {
try {
uvData = JSON.parse(utils.ReadFile(uStatsFile))
if (utils.FileExists(paths.uStatsFile)) {
uvData = JSON.parse(utils.ReadFile(paths.uStatsFile))
}
} catch (err) {
Log(
'Error at loading logs! (@ first run its normal)',
@ -207,7 +205,9 @@ function Load(): void {
}
try {
udvData = JSON.parse(utils.ReadFile(uvStatsFile))
if (utils.FileExists(paths.uvStatsFile)) {
udvData = JSON.parse(utils.ReadFile(paths.uvStatsFile))
}
} catch (err) {
Log(
'Error at loading logs! (@ first run its normal)',
@ -217,7 +217,9 @@ function Load(): void {
}
try {
vData = utils.ReadJSON(statFile)
if (utils.FileExists(paths.statFile)) {
vData = utils.ReadJSON(paths.statFile)
}
} catch (err) {
Log(
'Error at loading logs! (@ first run its normal)',
@ -227,7 +229,9 @@ function Load(): void {
}
try {
dvData = utils.ReadJSON(vStatFile)
if (utils.FileExists(paths.vStatFile)) {
dvData = utils.ReadJSON(paths.vStatFile)
}
} catch (err) {
Log(
'Error at loading visit logs! (@ first run its normal)',
@ -329,26 +333,26 @@ function Save() {
writes++
if (writes === writeInterval) {
try {
utils.WriteFile(JSON.stringify(uvData), uStatsFile)
utils.WriteFile(JSON.stringify(uvData), paths.uStatsFile)
} catch (err) {
Log('Error at writing logs! (more in stderr)', GetColor('redbg'))
console.error(err)
}
try {
utils.WriteFile(JSON.stringify(udvData), uvStatsFile)
utils.WriteFile(JSON.stringify(udvData), paths.uvStatsFile)
} catch (err) {
Log('Error at writing logs! (more in stderr)', GetColor('redbg'))
console.error(err)
}
try {
utils.WriteFile(JSON.stringify(vData), statFile)
utils.WriteFile(JSON.stringify(vData), paths.statFile)
// Log("Stats wrote.");
} catch (err) {
Log('Error at writing logs! (more in stderr)', GetColor('redbg'))
console.error(err)
}
try {
utils.WriteFile(JSON.stringify(dvData), vStatFile)
utils.WriteFile(JSON.stringify(dvData), paths.vStatFile)
// Log("Stats wrote.");
} catch (err) {
Log(
@ -463,8 +467,6 @@ export default {
hr: hr,
C: C,
logFileName: logFileName,
logDir: logDir,
vlogDir: vlogDir,
setLoggingDisabled: setLoggingDisabled,
logTable: logTable,
}