log - ensure to convert any arg to string (main logger)

Benjamin Pasero · Benjamin Pasero · commit 6cb0822d0c3b · 2020-01-15T13:56:38.000+01:00
diff --git a/src/vs/platform/log/common/log.ts b/src/vs/platform/log/common/log.ts
@@ -224,40 +224,48 @@ export class ConsoleLogInMainService extends AbstractLogService implements ILogS
 
 	trace(message: string, ...args: any[]): void {
 		if (this.getLevel() <= LogLevel.Trace) {
-			this.client.consoleLog('trace', [message, ...args]);
+			this.client.consoleLog('trace', [this.extractMessage(message), ...args]);
 		}
 	}
 
 	debug(message: string, ...args: any[]): void {
 		if (this.getLevel() <= LogLevel.Debug) {
-			this.client.consoleLog('debug', [message, ...args]);
+			this.client.consoleLog('debug', [this.extractMessage(message), ...args]);
 		}
 	}
 
 	info(message: string, ...args: any[]): void {
 		if (this.getLevel() <= LogLevel.Info) {
-			this.client.consoleLog('info', [message, ...args]);
+			this.client.consoleLog('info', [this.extractMessage(message), ...args]);
 		}
 	}
 
 	warn(message: string | Error, ...args: any[]): void {
 		if (this.getLevel() <= LogLevel.Warning) {
-			this.client.consoleLog('warn', [message, ...args]);
+			this.client.consoleLog('warn', [this.extractMessage(message), ...args]);
 		}
 	}
 
 	error(message: string | Error, ...args: any[]): void {
 		if (this.getLevel() <= LogLevel.Error) {
-			this.client.consoleLog('error', [toErrorMessage(message, this.getLevel() <= LogLevel.Trace), ...args]);
+			this.client.consoleLog('error', [this.extractMessage(message), ...args]);
 		}
 	}
 
 	critical(message: string | Error, ...args: any[]): void {
 		if (this.getLevel() <= LogLevel.Critical) {
-			this.client.consoleLog('critical', [toErrorMessage(message, this.getLevel() <= LogLevel.Trace), ...args]);
+			this.client.consoleLog('critical', [this.extractMessage(message), ...args]);
 		}
 	}
 
+	private extractMessage(msg: string | Error): string {
+		if (typeof msg === 'string') {
+			return msg;
+		}
+
+		return toErrorMessage(msg, this.getLevel() <= LogLevel.Trace);
+	}
+
 	dispose(): void {
 		// noop
 	}

Original file line number	Diff line number	Diff line change
`@@ -224,40 +224,48 @@ export class ConsoleLogInMainService extends AbstractLogService implements ILogS`
`224`	`224`
`225`	`225`	`trace(message: string, ...args: any[]): void {`
`226`	`226`	`if (this.getLevel() <= LogLevel.Trace) {`
`227`		`- this.client.consoleLog('trace', [message, ...args]);`
	`227`	`+ this.client.consoleLog('trace', [this.extractMessage(message), ...args]);`
`228`	`228`	`}`
`229`	`229`	`}`
`230`	`230`
`231`	`231`	`debug(message: string, ...args: any[]): void {`
`232`	`232`	`if (this.getLevel() <= LogLevel.Debug) {`
`233`		`- this.client.consoleLog('debug', [message, ...args]);`
	`233`	`+ this.client.consoleLog('debug', [this.extractMessage(message), ...args]);`
`234`	`234`	`}`
`235`	`235`	`}`
`236`	`236`
`237`	`237`	`info(message: string, ...args: any[]): void {`
`238`	`238`	`if (this.getLevel() <= LogLevel.Info) {`
`239`		`- this.client.consoleLog('info', [message, ...args]);`
	`239`	`+ this.client.consoleLog('info', [this.extractMessage(message), ...args]);`
`240`	`240`	`}`
`241`	`241`	`}`
`242`	`242`
`243`	`243`	`warn(message: string \| Error, ...args: any[]): void {`
`244`	`244`	`if (this.getLevel() <= LogLevel.Warning) {`
`245`		`- this.client.consoleLog('warn', [message, ...args]);`
	`245`	`+ this.client.consoleLog('warn', [this.extractMessage(message), ...args]);`
`246`	`246`	`}`
`247`	`247`	`}`
`248`	`248`
`249`	`249`	`error(message: string \| Error, ...args: any[]): void {`
`250`	`250`	`if (this.getLevel() <= LogLevel.Error) {`
`251`		`- this.client.consoleLog('error', [toErrorMessage(message, this.getLevel() <= LogLevel.Trace), ...args]);`
	`251`	`+ this.client.consoleLog('error', [this.extractMessage(message), ...args]);`
`252`	`252`	`}`
`253`	`253`	`}`
`254`	`254`
`255`	`255`	`critical(message: string \| Error, ...args: any[]): void {`
`256`	`256`	`if (this.getLevel() <= LogLevel.Critical) {`
`257`		`- this.client.consoleLog('critical', [toErrorMessage(message, this.getLevel() <= LogLevel.Trace), ...args]);`
	`257`	`+ this.client.consoleLog('critical', [this.extractMessage(message), ...args]);`
`258`	`258`	`}`
`259`	`259`	`}`
`260`	`260`
	`261`	`+ private extractMessage(msg: string \| Error): string {`
	`262`	`+ if (typeof msg === 'string') {`
	`263`	`+ return msg;`
	`264`	`+ }`
	`265`	`+`
	`266`	`+ return toErrorMessage(msg, this.getLevel() <= LogLevel.Trace);`
	`267`	`+ }`
	`268`	`+`
`261`	`269`	`dispose(): void {`
`262`	`270`	`// noop`
`263`	`271`	`}`