Fix microsoft#70998

sandy081 · sandy081 · commit af30445faccc · 2019-03-27T15:31:34.000+01:00
diff --git a/package.json b/package.json
@@ -40,7 +40,7 @@
     "native-watchdog": "1.0.0",
     "node-pty": "0.8.1",
     "semver": "^5.5.0",
-    "spdlog": "0.7.2",
+    "spdlog": "0.8.1",
     "sudo-prompt": "8.2.0",
     "v8-inspect-profiler": "^0.0.20",
     "vscode-chokidar": "1.6.5",
diff --git a/src/typings/spdlog.d.ts b/src/typings/spdlog.d.ts
@@ -7,6 +7,8 @@ declare module 'spdlog' {
 
 	export const version: string;
 	export function setAsyncMode(bufferSize: number, flushInterval: number): void;
+	export function createRotatingLogger(name: string, filename: string, filesize: number, filecount: number): RotatingLogger;
+	export function createRotatingLoggerAsync(name: string, filename: string, filesize: number, filecount: number): Promise<RotatingLogger>;
 
 	export enum LogLevel {
 		CRITICAL,
diff --git a/src/vs/platform/log/node/spdlogService.ts b/src/vs/platform/log/node/spdlogService.ts
@@ -25,7 +25,7 @@ export function createSpdLogService(processName: string, logLevel: LogLevel, log
 
 export function createRotatingLogger(name: string, filename: string, filesize: number, filecount: number): spdlog.RotatingLogger {
 	const _spdlog: typeof spdlog = require.__$__nodeRequire('spdlog');
-	return new _spdlog.RotatingLogger(name, filename, filesize, filecount);
+	return _spdlog.createRotatingLogger(name, filename, filesize, filecount);
 }
 
 class SpdLogService extends AbstractLogService implements ILogService {
diff --git a/src/vs/workbench/services/output/node/outputChannelModelService.ts b/src/vs/workbench/services/output/node/outputChannelModelService.ts
@@ -198,8 +198,8 @@ class DelegatedOutputChannelModel extends Disposable implements IOutputChannelMo
 			outputChannelModel = this.instantiationService.createInstance(BufferredOutputChannel, modelUri, mimeType);
 		}
 		this._register(outputChannelModel);
-		outputChannelModel.onDidAppendedContent(() => this._onDidAppendedContent.fire());
-		outputChannelModel.onDispose(() => this._onDispose.fire());
+		this._register(outputChannelModel.onDidAppendedContent(() => this._onDidAppendedContent.fire()));
+		this._register(outputChannelModel.onDispose(() => this._onDispose.fire()));
 		return outputChannelModel;
 	}
 
diff --git a/yarn.lock b/yarn.lock
@@ -8146,10 +8146,10 @@ sparkles@^1.0.0:
   resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.0.tgz#1acbbfb592436d10bbe8f785b7cc6f82815012c3"
   integrity sha1-Gsu/tZJDbRC76PeFt8xvgoFQEsM=
 
-spdlog@0.7.2:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/spdlog/-/spdlog-0.7.2.tgz#9298753d7694b9ee9bbfd7e01ea1e4c6ace1e64d"
-  integrity sha512-rHfWCaWMD4NindDnql6rc6kn7Bs8JR92jhiUpCl3D6v+jYcQ6GozMLig0RliOOR8st5mU+IHLZnr15fBys5x/Q==
+spdlog@0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/spdlog/-/spdlog-0.8.1.tgz#dfb3f3422ab3efe32be79e4769b95440ed72699f"
+  integrity sha512-W0s8IOXpn86md+8PJ4mJeB/22thykzH5YaNc3Rgnql4x4/zFIhvNiEx6/a1arnqvmJF0HtRO0Ehlswg0WcwTLQ==
   dependencies:
     bindings "^1.3.0"
     mkdirp "^0.5.1"

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ export function createSpdLogService(processName: string, logLevel: LogLevel, log`
`25`	`25`
`26`	`26`	`export function createRotatingLogger(name: string, filename: string, filesize: number, filecount: number): spdlog.RotatingLogger {`
`27`	`27`	`const _spdlog: typeof spdlog = require.__$__nodeRequire('spdlog');`
`28`		`- return new _spdlog.RotatingLogger(name, filename, filesize, filecount);`
	`28`	`+ return _spdlog.createRotatingLogger(name, filename, filesize, filecount);`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`class SpdLogService extends AbstractLogService implements ILogService {`
Original file line number	Diff line number	Diff line change
`@@ -198,8 +198,8 @@ class DelegatedOutputChannelModel extends Disposable implements IOutputChannelMo`
`198`	`198`	`outputChannelModel = this.instantiationService.createInstance(BufferredOutputChannel, modelUri, mimeType);`
`199`	`199`	`}`
`200`	`200`	`this._register(outputChannelModel);`
`201`		`- outputChannelModel.onDidAppendedContent(() => this._onDidAppendedContent.fire());`
`202`		`- outputChannelModel.onDispose(() => this._onDispose.fire());`
	`201`	`+ this._register(outputChannelModel.onDidAppendedContent(() => this._onDidAppendedContent.fire()));`
	`202`	`+ this._register(outputChannelModel.onDispose(() => this._onDispose.fire()));`
`203`	`203`	`return outputChannelModel;`
`204`	`204`	`}`
`205`	`205`