From 0d618bb1ef8d97dbc282c9d50e05910a2032ecdc Mon Sep 17 00:00:00 2001 From: Asher Date: Mon, 1 Jul 2019 14:18:30 -0500 Subject: [PATCH] Use spdlog for log service --- channel.ts | 2 +- server.ts | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/channel.ts b/channel.ts index 055baea8..9b830d4c 100644 --- a/channel.ts +++ b/channel.ts @@ -161,7 +161,7 @@ export class ExtensionEnvironmentChannel implements IServerChannel { throw new Error(`Invalid listen "${event}"`); } - public call(_: unknown, command: string, args?: any): Promise { + public call(_: unknown, command: string, _args?: any): Promise { switch (command) { case "getEnvironmentData": return this.getEnvironmentData(); case "getDiagnosticInfo": return this.getDiagnosticInfo(); diff --git a/server.ts b/server.ts index b7a04e9a..9ce59be6 100644 --- a/server.ts +++ b/server.ts @@ -16,11 +16,13 @@ import { parseMainProcessArgv } from "vs/platform/environment/node/argvHelper"; import { ParsedArgs } from "vs/platform/environment/common/environment"; import { EnvironmentService } from "vs/platform/environment/node/environmentService"; import { InstantiationService } from "vs/platform/instantiation/common/instantiationService"; -import { ConsoleLogMainService } from "vs/platform/log/common/log"; +import { getLogLevel } from "vs/platform/log/common/log"; import { LogLevelSetterChannel } from "vs/platform/log/common/logIpc"; +import { SpdLogService } from "vs/platform/log/node/spdlogService"; import { IProductConfiguration } from "vs/platform/product/common/product"; import { ConnectionType } from "vs/platform/remote/common/remoteAgentConnection"; import { REMOTE_FILE_SYSTEM_CHANNEL_NAME } from "vs/platform/remote/common/remoteAgentFileSystemChannel"; +import { RemoteExtensionLogFileName } from "vs/workbench/services/remote/common/remoteAgentService"; import { IWorkbenchConstructionOptions } from "vs/workbench/workbench.web.api"; import { Connection, Server as IServer } from "vs/server/connection"; @@ -112,8 +114,11 @@ export class Server implements IServer { this.environmentService = new EnvironmentService(args, process.execPath); - // TODO: might want to use spdlog. - const logService = new ConsoleLogMainService(); + const logService = new SpdLogService( + RemoteExtensionLogFileName, + this.environmentService.logsPath, + getLogLevel(this.environmentService), + ); this.ipc.registerChannel("loglevel", new LogLevelSetterChannel(logService)); const instantiationService = new InstantiationService();