💄

src/vs/platform/log/node/spdlogService.ts

@@ -9,11 +9,10 @@ import * as path from 'path';
 import { ILogService, LogLevel, NullLogService, AbstractLogService } from 'vs/platform/log/common/log';
 import { RotatingLogger, setAsyncMode } from 'spdlog';
 
-export function createSpdLogService(processName: string, logLevel: LogLevel, logsFolder: string, logsSubfolder?: string): ILogService {
+export function createSpdLogService(processName: string, logLevel: LogLevel, logsFolder: string): ILogService {
 	try {
 		setAsyncMode(8192, 2000);
-		const logsDirPath = logsSubfolder ? path.join(logsFolder, logsSubfolder) : logsFolder;
-		const logfilePath = path.join(logsDirPath, `${processName}.log`);
+		const logfilePath = path.join(logsFolder, `${processName}.log`);
 		const logger = new RotatingLogger(processName, logfilePath, 1024 * 1024 * 5, 6);
 		logger.setLevel(0);
 

src/vs/workbench/api/node/extHostLogService.ts

@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import * as path from 'path';
 import * as vscode from 'vscode';
 import { TPromise } from 'vs/base/common/winjs.base';
+import { join } from 'vs/base/common/paths';
 import { mkdirp, dirExists } from 'vs/base/node/pfs';
 import Event from 'vs/base/common/event';
 import { LogLevel } from 'vs/workbench/api/node/extHostTypes';
@@ -43,8 +43,8 @@ export class ExtHostLogService extends DelegatedLogService implements ILogServic
 	}
 
 	private createLogger(extensionID: string): ExtHostLogger {
-		const logService = createSpdLogService(extensionID, this.getLevel(), this._environmentService.logsPath, extensionID);
-		const logsDirPath = path.join(this._environmentService.logsPath, extensionID);
+		const logsDirPath = join(this._environmentService.logsPath, extensionID);
+		const logService = createSpdLogService(extensionID, this.getLevel(), logsDirPath);
 		this._register(this.onDidChangeLogLevel(level => logService.setLevel(level)));
 		return new ExtHostLogger(logService, logsDirPath);
 	}