Skip to content

Commit 4ec9145

Browse files
Vladislav Kaluginladisgin
authored andcommitted
Update log4js
1 parent 58cd8ce commit 4ec9145

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

vscode-plugin/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@
576576
"grpc": "npm:@grpc/grpc-js@1.5.5",
577577
"grpc-tools": "1.11.2",
578578
"grpc_tools_node_protoc_ts": "5.3.2",
579-
"log4js": "6.3.0",
579+
"log4js": "6.5.2",
580580
"randomstring": "1.2.2",
581581
"source-map-support": "0.5.21",
582582
"typescript": "3.9.4"

vscode-plugin/src/logger.ts

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import * as log4js from "log4js";
77
import 'source-map-support/register';
88
import * as vs from 'vscode';
99
import { utbotUI } from "./interface/utbotUI";
10-
10+
import {AppenderModule, AppenderFunction} from "log4js";
1111

1212
export type LogLevel = 'FATAL' | 'ERROR' | 'DEBUG' | 'TRACE' | 'INFO' | 'WARN';
1313

@@ -17,7 +17,7 @@ export class ExtensionLogger {
1717
public static get logger(): log4js.Logger {
1818
if (ExtensionLogger._logger === undefined) {
1919
ExtensionLogger._logger = Logger.getLog4JsLogger(
20-
'INFO',
20+
'INFO',
2121
utbotUI.channels().outputClientLogChannel
2222
);
2323
}
@@ -44,28 +44,23 @@ export class Logger {
4444
* Configurates Log4js logger.
4545
*/
4646
private static configureLog4js(configLogLevel: LogLevel, outputLogChannel: vs.OutputChannel): log4js.Logger {
47-
/**
48-
* Creating custom appender, that writes logs to
49-
* VS Code output channel
47+
/**
48+
* Creating custom appender, that writes logs to
49+
* VS Code output channel
5050
*/
51-
const vscodeOutChannelAppender = {
52-
configure: (config: any, layouts: any): {} => {
53-
const vscodeAppender = (loggingEvent: log4js.LoggingEvent): void => {
51+
const vscodeOutChannelAppender: AppenderModule = {
52+
configure: (config: any, layouts: any): AppenderFunction => {
53+
const vscodeAppender: AppenderFunction = (loggingEvent: log4js.LoggingEvent): void => {
5454
let layout = layouts.basicLayout;
5555
if (config.layout) {
5656
layout = layouts.layout(config.layout.type, config.layout);
5757
}
5858
outputLogChannel.append(`${layout(loggingEvent, config.timezoneOffset)}`);
5959
};
6060

61-
vscodeAppender.shutdown = (done: any): void => {
62-
outputLogChannel.dispose();
63-
setTimeout(done, 10);
64-
};
6561
return vscodeAppender;
6662
}
6763
};
68-
6964
log4js.configure({
7065
appenders: {
7166
vscodeOutChannel: {
@@ -78,11 +73,11 @@ export class Logger {
7873
console: {
7974
type: 'console',
8075
layout: {
81-
type: 'pattern',
76+
type: 'pattern',
8277
pattern: this.patternString
8378
}
8479
},
85-
vscodeOutChannelForClientOnlyAppender : {
80+
vscodeOutChannelForClientOnlyAppender: {
8681
type: vscodeOutChannelAppender,
8782
layout: {
8883
type: 'pattern',
@@ -103,14 +98,19 @@ export class Logger {
10398

10499
},
105100
categories: {
106-
default: { appenders: ['vscodeOutChannelForInfo', 'vscodeOutChannelForDebug', 'console'], level: configLogLevel, enableCallStack: true },
101+
default: {
102+
appenders: ['vscodeOutChannelForInfo', 'vscodeOutChannelForDebug', 'console'],
103+
level: configLogLevel,
104+
enableCallStack: true
105+
},
107106
}
108107
});
109108

110109
return log4js.getLogger("Client");
111110
}
112-
111+
113112
public static configToLog4jsLogLevel(configLogLevel: LogLevel): string {
114113
return configLogLevel.toLowerCase();
115114
}
116115
}
116+

0 commit comments

Comments
 (0)