mirrors
/
uptime-kuma
mirror of https://github.com/louislam/uptime-kuma.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix: do not colorize non-string log message

This commit is contained in:
Louis Lam 2023-10-14 17:48:41 +08:00
parent f6bdaacbba
commit a362206fab
3 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/monitor-types/real-browser-monitor-type.js
View File

@ -49,8 +49,6 @@ if (process.platform === "win32") {
]; ];
} }
log.debug("chrome", allowedList);
/** /**
* Is the executable path allowed? * Is the executable path allowed?
* @param {string} executablePath Path to executable * @param {string} executablePath Path to executable

16
src/util.js
View File

@ -147,13 +147,25 @@ class Logger {
console.warn(timePart, modulePart, levelPart, msg); console.warn(timePart, modulePart, levelPart, msg);
} }
else if (level === "ERROR") { else if (level === "ERROR") {
let msgPart = exports.CONSOLE_STYLE_FgRed + msg + exports.CONSOLE_STYLE_Reset; let msgPart;
if (typeof msg === "string") {
msgPart = exports.CONSOLE_STYLE_FgRed + msg + exports.CONSOLE_STYLE_Reset;
}
else {
msgPart = msg;
}
console.error(timePart, modulePart, levelPart, msgPart); console.error(timePart, modulePart, levelPart, msgPart);
} }
else if (level === "DEBUG") { else if (level === "DEBUG") {
if (exports.isDev) { if (exports.isDev) {
timePart = exports.CONSOLE_STYLE_FgGray + now + exports.CONSOLE_STYLE_Reset; timePart = exports.CONSOLE_STYLE_FgGray + now + exports.CONSOLE_STYLE_Reset;
let msgPart = exports.CONSOLE_STYLE_FgGray + msg + exports.CONSOLE_STYLE_Reset; let msgPart;
if (typeof msg === "string") {
msgPart = exports.CONSOLE_STYLE_FgGray + msg + exports.CONSOLE_STYLE_Reset;
}
else {
msgPart = msg;
}
console.debug(timePart, modulePart, levelPart, msgPart); console.debug(timePart, modulePart, levelPart, msgPart);
} }
} }

16
src/util.ts
View File

@ -208,13 +208,23 @@ class Logger {
} else if (level === "WARN") { } else if (level === "WARN") {
console.warn(timePart, modulePart, levelPart, msg); console.warn(timePart, modulePart, levelPart, msg);
} else if (level === "ERROR") { } else if (level === "ERROR") {
let msgPart = CONSOLE_STYLE_FgRed + msg + CONSOLE_STYLE_Reset; let msgPart :string;
if (typeof msg === "string") {
msgPart = CONSOLE_STYLE_FgRed + msg + CONSOLE_STYLE_Reset;
} else {
msgPart = msg;
}
console.error(timePart, modulePart, levelPart, msgPart); console.error(timePart, modulePart, levelPart, msgPart);
} else if (level === "DEBUG") { } else if (level === "DEBUG") {
if (isDev) { if (isDev) {
timePart = CONSOLE_STYLE_FgGray + now + CONSOLE_STYLE_Reset; timePart = CONSOLE_STYLE_FgGray + now + CONSOLE_STYLE_Reset;
let msgPart = CONSOLE_STYLE_FgGray + msg + CONSOLE_STYLE_Reset; let msgPart :string;
console.debug(timePart, modulePart, levelPart, msgPart ); if (typeof msg === "string") {
msgPart = CONSOLE_STYLE_FgGray + msg + CONSOLE_STYLE_Reset;
} else {
msgPart = msg;
}
console.debug(timePart, modulePart, levelPart, msgPart);
} }
} else { } else {
console.log(timePart, modulePart, msg); console.log(timePart, modulePart, msg);