Karl/homepage
1
0
Fork 0
mirror of https://github.com/karl0ss/homepage.git synced 2025-05-02 05:23:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Enhancement: support LOG_TARGETS environment variable (#3075)

Browse Source
This commit is contained in:
Jon Seager 2024-03-06 08:51:53 +00:00 committed by shamoon
parent 9caede1cc3
commit 8b029ac11c
2 changed files with 73 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/configs/settings.md
View File

@ -406,6 +406,8 @@ By default the homepage logfile is written to the a `logs` subdirectory of the `
logpath: /logfile/path logpath: /logfile/path
``` ```
By default, logs are sent both to `stdout` and to a file at the path specified. This can be changed by setting the `LOG_TARGETS` environment variable to one of `both` (default), `stdout` or `file`.
## Show Docker Stats ## Show Docker Stats
You can show all docker stats expanded in `settings.yaml`: You can show all docker stats expanded in `settings.yaml`:

49
src/utils/logger.js
View File

@ -3,15 +3,10 @@ import { format as utilFormat } from "node:util";
import winston from "winston"; import winston from "winston";
import checkAndCopyConfig, { getSettings, CONF_DIR } from "utils/config/config"; import checkAndCopyConfig, { CONF_DIR, getSettings } from "utils/config/config";
let winstonLogger; let winstonLogger;
function init() {
checkAndCopyConfig("settings.yaml");
const settings = getSettings();
const logpath = settings.logpath || CONF_DIR;
function combineMessageAndSplat() { function combineMessageAndSplat() {
return { return {
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
@ -38,10 +33,8 @@ function init() {
return `[${logInfo.timestamp}] ${logInfo.level}: ${logInfo.message}`; return `[${logInfo.timestamp}] ${logInfo.level}: ${logInfo.message}`;
} }
winstonLogger = winston.createLogger({ function getConsoleLogger() {
level: process.env.LOG_LEVEL || "info", return new winston.transports.Console({
transports: [
new winston.transports.Console({
format: winston.format.combine( format: winston.format.combine(
winston.format.errors({ stack: true }), winston.format.errors({ stack: true }),
combineMessageAndSplat(), combineMessageAndSplat(),
@ -51,9 +44,14 @@ function init() {
), ),
handleExceptions: true, handleExceptions: true,
handleRejections: true, handleRejections: true,
}), });
}
new winston.transports.File({ function getFileLogger() {
const settings = getSettings();
const logpath = settings.logpath || CONF_DIR;
return new winston.transports.File({
format: winston.format.combine( format: winston.format.combine(
winston.format.errors({ stack: true }), winston.format.errors({ stack: true }),
combineMessageAndSplat(), combineMessageAndSplat(),
@ -63,8 +61,31 @@ function init() {
filename: `${logpath}/logs/homepage.log`, filename: `${logpath}/logs/homepage.log`,
handleExceptions: true, handleExceptions: true,
handleRejections: true, handleRejections: true,
}), });
], }
function init() {
checkAndCopyConfig("settings.yaml");
const configuredTargets = process.env.LOG_TARGETS || "both";
const loggingTransports = [];
switch (configuredTargets) {
case "both":
loggingTransports.push(getConsoleLogger(), getFileLogger());
break;
case "stdout":
loggingTransports.push(getConsoleLogger());
break;
case "file":
loggingTransports.push(getFileLogger());
break;
default:
loggingTransports.push(getConsoleLogger(), getFileLogger());
}
winstonLogger = winston.createLogger({
level: process.env.LOG_LEVEL || "info",
transports: loggingTransports,
}); });
// patch the console log mechanism to use our logger // patch the console log mechanism to use our logger