Persist log level change in web

microsoft · Sep 2, 2019 · 31857fa · 31857fa
1 parent b8d5f4c
commit 31857fa
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/vs/platform/log/common/bufferLog.ts b/src/vs/platform/log/common/bufferLog.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ILogService, LogLevel, AbstractLogService } from 'vs/platform/log/common/log';
+import { ILogService, LogLevel, AbstractLogService, DEFAULT_LOG_LEVEL } from 'vs/platform/log/common/log';
 
 interface ILog {
 	level: LogLevel;
@@ -28,8 +28,9 @@ export class BufferLogService extends AbstractLogService implements ILogService
 	private buffer: ILog[] = [];
 	private _logger: ILogService | undefined = undefined;
 
-	constructor() {
+	constructor(logLevel: LogLevel = DEFAULT_LOG_LEVEL) {
 		super();
+		this.setLevel(logLevel);
 		this._register(this.onDidChangeLogLevel(level => {
 			if (this._logger) {
 				this._logger.setLevel(level);
@@ -86,4 +87,4 @@ export class BufferLogService extends AbstractLogService implements ILogService
 			this._logger.dispose();
 		}
 	}
-}
+}
diff --git a/src/vs/workbench/browser/web.main.ts b/src/vs/workbench/browser/web.main.ts
@@ -121,7 +121,7 @@ class CodeRendererMain extends Disposable {
 
 		// Log
 		const logsPath = URI.file(toLocalISOString(new Date()).replace(/-|:|\.\d+Z$/g, '')).with({ scheme: 'vscode-log' });
-		const logService = new BufferLogService();
+		const logService = new BufferLogService(this.configuration.logLevel);
 		serviceCollection.set(ILogService, logService);
 
 		const payload = this.resolveWorkspaceInitializationPayload();

diff --git a/src/vs/workbench/workbench.web.api.ts b/src/vs/workbench/workbench.web.api.ts
@@ -12,6 +12,7 @@ import { ICredentialsProvider } from 'vs/workbench/services/credentials/browser/
 import { IExtensionManifest } from 'vs/platform/extensions/common/extensions';
 import { IURLCallbackProvider } from 'vs/workbench/services/url/browser/urlService';
 import { IProductConfiguration } from 'vs/platform/product/common/product';
+import { LogLevel } from 'vs/platform/log/common/log';
 
 export interface IWorkbenchConstructionOptions {
 
@@ -77,6 +78,11 @@ export interface IWorkbenchConstructionOptions {
 	 * Experimental: Support for product configuration.
 	 */
 	productConfiguration?: IProductConfiguration;
+
+	/**
+	 * Current logging level. Default is `LogLevel.Info`.
+	 */
+	logLevel?: LogLevel;
 }
 
 /**