shpaq/sct-overseerr
1
0
Fork 0
mirror of https://github.com/sct/overseerr.git synced 2025-09-17 17:24:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat(logs): use separate json file to parse logs for log viewer (#2399)

Browse Source 
Co-authored-by: Ryan Cohen <ryan@sct.dev>
This commit is contained in:
Danshil Kokil Mungur
2022-01-20 09:17:03 +04:00
committed by GitHub
parent 1f5785d6c5
commit ce31bef8a1
2 changed files with 50 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
server/logger.ts
View File

@@ -1,7 +1,7 @@
import fs from 'fs';
import path from 'path';
import * as winston from 'winston'; import * as winston from 'winston';
import 'winston-daily-rotate-file'; import 'winston-daily-rotate-file';
import path from 'path';
import fs from 'fs';
// Migrate away from old log // Migrate away from old log
const OLD_LOG_FILE = path.join(__dirname, '../config/logs/overseerr.log'); const OLD_LOG_FILE = path.join(__dirname, '../config/logs/overseerr.log');
@@ -52,6 +52,22 @@ const logger = winston.createLogger({
createSymlink: true, createSymlink: true,
symlinkName: 'overseerr.log', symlinkName: 'overseerr.log',
}), }),
new winston.transports.DailyRotateFile({
filename: process.env.CONFIG_DIRECTORY
? `${process.env.CONFIG_DIRECTORY}/logs/.machinelogs-%DATE%.json`
: path.join(__dirname, '../config/logs/.machinelogs-%DATE%.json'),
datePattern: 'YYYY-MM-DD',
zippedArchive: true,
maxSize: '20m',
maxFiles: '1d',
createSymlink: true,
symlinkName: '.machinelogs.json',
format: winston.format.combine(
winston.format.splat(),
winston.format.timestamp(),
winston.format.json()
),
}),
], ],
}); });

56
server/routes/settings/index.ts
View File

@@ -303,38 +303,46 @@ settingsRoutes.get(
} }
const logFile = process.env.CONFIG_DIRECTORY const logFile = process.env.CONFIG_DIRECTORY
? `${process.env.CONFIG_DIRECTORY}/logs/overseerr.log` ? `${process.env.CONFIG_DIRECTORY}/logs/.machinelogs.json`
: path.join(__dirname, '../../../config/logs/overseerr.log'); : path.join(__dirname, '../../../config/logs/.machinelogs.json');
const logs: LogMessage[] = []; const logs: LogMessage[] = [];
const logMessageProperties = [
'timestamp',
'level',
'label',
'message',
'data',
];
try { try {
fs.readFileSync(logFile) fs.readFileSync(logFile, 'utf-8')
.toString() .split('\n')
.split(/(?=\n\d{4}-\d{2})/g)
.forEach((line) => { .forEach((line) => {
if (!line.length) return; if (!line.length) return;
const jsonRegexp = new RegExp( const logMessage = JSON.parse(line);
/[{[]{1}([,:{}[\]0-9.\-+Eaeflnr-u \n\r\t]|"[^"\n]*?")+[}\]]{1}/
);
const timestamp = line.match(new RegExp(/.{24}/)) || []; if (!filter.includes(logMessage.level)) {
const level = line.match(new RegExp(/(?<=.{24}\s\[).+?(?=\])/)) || []; return;
const label =
line.match(new RegExp(/(?<=.{24}\s\[.+\]\[).+?(?=\])/)) || [];
const message =
line.match(new RegExp(/(?<=\[.+\]:\s)[\s\S][^\r]+/)) || [];
const data = message[0].match(jsonRegexp) || [];
if (level.length && filter.includes(level[0])) {
logs.push({
timestamp: timestamp[0],
level: level[0],
label: label[0],
message: message[0].replace(jsonRegexp, ''),
data: data.length ? JSON.parse(data[0]) : undefined,
});
} }
if (
!Object.keys(logMessage).every((key) =>
logMessageProperties.includes(key)
)
) {
Object.keys(logMessage)
.filter((prop) => !logMessageProperties.includes(prop))
.forEach((prop) => {
Object.assign(logMessage, {
data: {
[prop]: logMessage[prop],
},
});
});
}
logs.push(logMessage);
}); });
const displayedLogs = logs.reverse().slice(skip, skip + pageSize); const displayedLogs = logs.reverse().slice(skip, skip + pageSize);