jeans/arduino-ide
jeans/arduino-ide
1
0
Fork 0
mirror of https://github.com/arduino/arduino-ide.git synced 2025-06-13 23:56:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Log clean-up.

Browse Source 
Signed-off-by: Akos Kitta <kittaakos@typefox.io>
This commit is contained in:
Akos Kitta 2019-08-30 10:26:13 +02:00
parent 98764b56aa
commit 9298a8cc55
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arduino-ide-extension/src/node/daemon-log.ts
View File

@ -83,7 +83,7 @@ export namespace DaemonLog {
export function log(logger: ILogger, logMessages: string): void { export function log(logger: ILogger, logMessages: string): void {
const parsed = parse(logMessages); const parsed = parse(logMessages);
for (const log of parsed) { for (const log of parsed) {
logger.log(toLogLevel(log), toMessage(log).trim()); // XXX: `trim` as `toMessage` appends a NL. logger.log(toLogLevel(log), toMessage(log));
} }
} }
@ -107,14 +107,14 @@ export namespace DaemonLog {
return result; return result;
} }
export function toPrettyString(logMessages: string, logger?: ILogger): string { export function toPrettyString(logMessages: string): string {
const parsed = parse(logMessages); const parsed = parse(logMessages);
return parsed.map(toMessage).join(''); return parsed.map(toMessage).join('\n');
} }
function toMessage(log: DaemonLog): string { function toMessage(log: DaemonLog): string {
const details = Object.keys(log).filter(key => key !== 'msg' && key !== 'level' && key !== 'time').map(key => toDetails(log, key)).join(', '); const details = Object.keys(log).filter(key => key !== 'msg' && key !== 'level' && key !== 'time').map(key => toDetails(log, key)).join(', ');
return `[${log.level.toUpperCase()}] ${log.msg}${!!details ? ` [${details}]` : ''}\n` return `[${log.level.toUpperCase()}] ${log.msg}${!!details ? ` [${details}]` : ''}`
} }
function toDetails(log: DaemonLog, key: string): string { function toDetails(log: DaemonLog, key: string): string {
@ -124,7 +124,7 @@ export namespace DaemonLog {
} else if (DaemonLog.Tool.is(value)) { } else if (DaemonLog.Tool.is(value)) {
value = DaemonLog.Tool.toString(value); value = DaemonLog.Tool.toString(value);
} else if (typeof value === 'object') { } else if (typeof value === 'object') {
value = JSON.stringify(value).replace(/\"([^(\")"]+)\":/g, '$1:'); value = JSON.stringify(value).replace(/\"([^(\")"]+)\":/g, '$1:'); // Remove the quotes from the property keys.
} }
return `${key.toLowerCase()}: ${value}`; return `${key.toLowerCase()}: ${value}`;
} }