improve main logger

joaomoreno · joaomoreno · commit 7a8436c63485 · 2017-12-04T18:12:14.000+01:00
diff --git a/src/vs/code/electron-main/main.ts b/src/vs/code/electron-main/main.ts
@@ -53,6 +53,8 @@ function createServices(args: ParsedArgs): IInstantiationService {
 	const logService = new MultiplexLogService([legacyLogService, spdlogService]);
 	registerGlobalLogService(logService);
 
+	logService.info('main', process.argv);
+
 	// Eventually cleanup
 	setTimeout(() => spdlogService.cleanup().then(null, err => console.error(err)), 10000);
 
diff --git a/src/vs/platform/log/common/log.ts b/src/vs/platform/log/common/log.ts
@@ -48,37 +48,37 @@ export class LegacyLogMainService implements ILogService {
 
 	trace(message: string, ...args: any[]): void {
 		if (this.level <= LogLevel.Trace) {
-			console.log(`\x1b[90m[main ${new Date().toLocaleTimeString()}]\x1b[0m`, ...args);
+			console.log(`\x1b[90m[main ${new Date().toLocaleTimeString()}]\x1b[0m`, message, ...args);
 		}
 	}
 
 	debug(message: string, ...args: any[]): void {
 		if (this.level <= LogLevel.Debug) {
-			console.log(`\x1b[90m[main ${new Date().toLocaleTimeString()}]\x1b[0m`, ...args);
+			console.log(`\x1b[90m[main ${new Date().toLocaleTimeString()}]\x1b[0m`, message, ...args);
 		}
 	}
 
 	info(message: string, ...args: any[]): void {
 		if (this.level <= LogLevel.Info) {
-			console.log(`\x1b[90m[main ${new Date().toLocaleTimeString()}]\x1b[0m`, ...args);
+			console.log(`\x1b[90m[main ${new Date().toLocaleTimeString()}]\x1b[0m`, message, ...args);
 		}
 	}
 
 	warn(message: string | Error, ...args: any[]): void {
 		if (this.level <= LogLevel.Warning) {
-			console.warn(`\x1b[93m[main ${new Date().toLocaleTimeString()}]\x1b[0m`, ...args);
+			console.warn(`\x1b[93m[main ${new Date().toLocaleTimeString()}]\x1b[0m`, message, ...args);
 		}
 	}
 
 	error(message: string, ...args: any[]): void {
 		if (this.level <= LogLevel.Error) {
-			console.error(`\x1b[91m[main ${new Date().toLocaleTimeString()}]\x1b[0m`, ...args);
+			console.error(`\x1b[91m[main ${new Date().toLocaleTimeString()}]\x1b[0m`, message, ...args);
 		}
 	}
 
 	critical(message: string, ...args: any[]): void {
 		if (this.level <= LogLevel.Critical) {
-			console.error(`\x1b[90m[main ${new Date().toLocaleTimeString()}]\x1b[0m`, ...args);
+			console.error(`\x1b[90m[main ${new Date().toLocaleTimeString()}]\x1b[0m`, message, ...args);
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -48,37 +48,37 @@ export class LegacyLogMainService implements ILogService {`
`48`	`48`
`49`	`49`	`trace(message: string, ...args: any[]): void {`
`50`	`50`	`if (this.level <= LogLevel.Trace) {`
`51`		- console.log(`\x1b[90m[main ${new Date().toLocaleTimeString()}]\x1b[0m`, ...args);
	`51`	+ console.log(`\x1b[90m[main ${new Date().toLocaleTimeString()}]\x1b[0m`, message, ...args);
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`debug(message: string, ...args: any[]): void {`
`56`	`56`	`if (this.level <= LogLevel.Debug) {`
`57`		- console.log(`\x1b[90m[main ${new Date().toLocaleTimeString()}]\x1b[0m`, ...args);
	`57`	+ console.log(`\x1b[90m[main ${new Date().toLocaleTimeString()}]\x1b[0m`, message, ...args);
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`info(message: string, ...args: any[]): void {`
`62`	`62`	`if (this.level <= LogLevel.Info) {`
`63`		- console.log(`\x1b[90m[main ${new Date().toLocaleTimeString()}]\x1b[0m`, ...args);
	`63`	+ console.log(`\x1b[90m[main ${new Date().toLocaleTimeString()}]\x1b[0m`, message, ...args);
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`warn(message: string \| Error, ...args: any[]): void {`
`68`	`68`	`if (this.level <= LogLevel.Warning) {`
`69`		- console.warn(`\x1b[93m[main ${new Date().toLocaleTimeString()}]\x1b[0m`, ...args);
	`69`	+ console.warn(`\x1b[93m[main ${new Date().toLocaleTimeString()}]\x1b[0m`, message, ...args);
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`error(message: string, ...args: any[]): void {`
`74`	`74`	`if (this.level <= LogLevel.Error) {`
`75`		- console.error(`\x1b[91m[main ${new Date().toLocaleTimeString()}]\x1b[0m`, ...args);
	`75`	+ console.error(`\x1b[91m[main ${new Date().toLocaleTimeString()}]\x1b[0m`, message, ...args);
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`critical(message: string, ...args: any[]): void {`
`80`	`80`	`if (this.level <= LogLevel.Critical) {`
`81`		- console.error(`\x1b[90m[main ${new Date().toLocaleTimeString()}]\x1b[0m`, ...args);
	`81`	+ console.error(`\x1b[90m[main ${new Date().toLocaleTimeString()}]\x1b[0m`, message, ...args);
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`	`}`