Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 19:18:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

More ExtHostLogger tweaks, and remove logLevel syncing code, for real investigation later

Browse Source
This commit is contained in:
Rob Lourens
2017-12-13 14:16:00 -08:00
parent d279e2de6c
commit 35c7351761
3 changed files with 13 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/vs/workbench/api/node/extHost.protocol.ts
View File

@@ -33,7 +33,7 @@ import { IConfigurationData, ConfigurationTarget, IConfigurationModel } from 'vs
import { IPickOpenEntry, IPickOptions } from 'vs/platform/quickOpen/common/quickOpen';
import { SaveReason } from 'vs/workbench/services/textfile/common/textfiles';
import { TextEditorCursorStyle } from 'vs/editor/common/config/editorOptions';
import { EndOfLine, TextEditorLineNumbersStyle, LogLevel } from 'vs/workbench/api/node/extHostTypes';
import { EndOfLine, TextEditorLineNumbersStyle } from 'vs/workbench/api/node/extHostTypes';
import { TaskSet } from 'vs/workbench/parts/tasks/common/tasks';
@@ -673,10 +673,6 @@ export interface ExtHostWindowShape {
$onDidChangeWindowFocus(value: boolean): void;
}
export interface ExtHostLogServiceShape {
$acceptLogLevelChanged(logLevel: LogLevel): void;
}
// --- proxy identifiers
export const MainContext = {

29
src/vs/workbench/api/node/extHostLogService.ts
View File

@@ -9,31 +9,23 @@ import * as vscode from 'vscode';
import { TPromise } from 'vs/base/common/winjs.base';
import { mkdirp, dirExists } from 'vs/base/node/pfs';
import Event, { Emitter } from 'vs/base/common/event';
import { ExtHostLogServiceShape } from './extHost.protocol';
import { LogLevel } from 'vs/workbench/api/node/extHostTypes';
import { ILogService } from 'vs/platform/log/common/log';
import { createLogService } from 'vs/platform/log/node/spdlogService';
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
import { memoize } from 'vs/base/common/decorators';
export class ExtHostLogService implements ExtHostLogServiceShape {
export class ExtHostLogService {
private _loggers: Map<string, ExtHostLogger> = new Map();
private _onDidChangeLogLevel: Emitter<LogLevel>;
get onDidChangeLogLevel(): Event<LogLevel> { return this._onDidChangeLogLevel.event; }
constructor(private _environmentService: IEnvironmentService) {
this._onDidChangeLogLevel = new Emitter<LogLevel>();
}
$acceptLogLevelChanged(logLevel: LogLevel): void {
this._onDidChangeLogLevel.fire(logLevel);
}
getExtLogger(extensionID: string): ExtHostLogger {
if (!this._loggers.has(extensionID)) {
const logService = createLogService(extensionID, this._environmentService, extensionID);
const logsDirPath = path.join(this._environmentService.logsPath, extensionID);
this._loggers.set(extensionID, new ExtHostLogger(this, logService, logsDirPath));
this._loggers.set(extensionID, new ExtHostLogger(logService, logsDirPath));
}
return this._loggers.get(extensionID);
@@ -42,21 +34,24 @@ export class ExtHostLogService implements ExtHostLogServiceShape {
export class ExtHostLogger implements vscode.Logger {
private _currentLevel: LogLevel;
private _onDidChangeLogLevel: Emitter<LogLevel>;
constructor(
private readonly _extHostLogService: ExtHostLogService,
private readonly _logService: ILogService,
private readonly _logDirectory: string
) {
this._currentLevel = this._logService.getLevel();
this._extHostLogService.onDidChangeLogLevel(logLevel => this._currentLevel = logLevel);
this._onDidChangeLogLevel = new Emitter<LogLevel>();
this.onDidChangeLogLevel = this._onDidChangeLogLevel.event;
}
get onDidChangeLogLevel(): Event<LogLevel> { return this._extHostLogService.onDidChangeLogLevel; }
// TODO
readonly onDidChangeLogLevel: Event<LogLevel>;
get currentLevel(): LogLevel { return this._currentLevel; }
getLogDirectory(): TPromise<string> {
@memoize
get logDirectory(): TPromise<string> {
return dirExists(this._logDirectory).then(exists => {
if (exists) {
return TPromise.wrap(null);
@@ -68,10 +63,6 @@ export class ExtHostLogger implements vscode.Logger {
});
}
getLevel(): vscode.LogLevel {
return this._currentLevel;
}
trace(message: string, ...args: any[]): void {
return this._logService.trace(message, ...args);
}