@theia/core 1.57.0-next.112 → 1.57.0-next.136
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/browser/catalog.json +21 -5
- package/lib/browser/logger-frontend-module.d.ts.map +1 -1
- package/lib/browser/logger-frontend-module.js +2 -3
- package/lib/browser/logger-frontend-module.js.map +1 -1
- package/lib/common/logger-binding.d.ts +3 -0
- package/lib/common/logger-binding.d.ts.map +1 -0
- package/lib/common/logger-binding.js +36 -0
- package/lib/common/logger-binding.js.map +1 -0
- package/lib/common/logger-protocol.d.ts +1 -1
- package/lib/common/logger-protocol.d.ts.map +1 -1
- package/lib/common/logger-protocol.js +3 -1
- package/lib/common/logger-protocol.js.map +1 -1
- package/lib/common/logger.d.ts +1 -0
- package/lib/common/logger.d.ts.map +1 -1
- package/lib/common/logger.js +12 -1
- package/lib/common/logger.js.map +1 -1
- package/lib/node/console-logger-server.d.ts +5 -1
- package/lib/node/console-logger-server.d.ts.map +1 -1
- package/lib/node/console-logger-server.js +18 -4
- package/lib/node/console-logger-server.js.map +1 -1
- package/lib/node/logger-backend-module.d.ts.map +1 -1
- package/lib/node/logger-backend-module.js +2 -3
- package/lib/node/logger-backend-module.js.map +1 -1
- package/lib/node/logger-cli-contribution.d.ts +2 -0
- package/lib/node/logger-cli-contribution.d.ts.map +1 -1
- package/lib/node/logger-cli-contribution.js +40 -7
- package/lib/node/logger-cli-contribution.js.map +1 -1
- package/package.json +4 -4
- package/src/browser/logger-frontend-module.ts +3 -4
- package/src/common/logger-binding.ts +34 -0
- package/src/common/logger-protocol.ts +4 -2
- package/src/common/logger.ts +10 -1
- package/src/node/console-logger-server.ts +22 -2
- package/src/node/logger-backend-module.ts +3 -4
- package/src/node/logger-cli-contribution.ts +43 -7
package/lib/browser/catalog.json
CHANGED
|
@@ -2299,7 +2299,7 @@
|
|
|
2299
2299
|
"*.ksail.yaml",
|
|
2300
2300
|
"*.ksail.yml"
|
|
2301
2301
|
],
|
|
2302
|
-
"url": "https://
|
|
2302
|
+
"url": "https://raw.githubusercontent.com/devantler/ksail/refs/heads/main/schemas/ksail-cluster-schema.json"
|
|
2303
2303
|
},
|
|
2304
2304
|
{
|
|
2305
2305
|
"name": "function.json",
|
|
@@ -5024,6 +5024,12 @@
|
|
|
5024
5024
|
"fileMatch": ["*.sprite"],
|
|
5025
5025
|
"url": "https://json.schemastore.org/sprite.json"
|
|
5026
5026
|
},
|
|
5027
|
+
{
|
|
5028
|
+
"name": "SPDX 2.3",
|
|
5029
|
+
"description": "System Package Data Exchange (SPDX) definition",
|
|
5030
|
+
"fileMatch": ["*.spdx.json", "*.spdx.yaml", "*.spdx.yml"],
|
|
5031
|
+
"url": "https://raw.githubusercontent.com/spdx/spdx-spec/refs/tags/v2.3/schemas/spdx-schema.json"
|
|
5032
|
+
},
|
|
5027
5033
|
{
|
|
5028
5034
|
"name": "sqlc configuration",
|
|
5029
5035
|
"description": "Configuration file for sqlc v2",
|
|
@@ -7231,18 +7237,22 @@
|
|
|
7231
7237
|
"name": "CRS WAF test file",
|
|
7232
7238
|
"description": "Definition of a test for verifying WAF behavior",
|
|
7233
7239
|
"fileMatch": ["*.waft", ".waft.yaml", ".waft.yml"],
|
|
7234
|
-
"url": "https://raw.githubusercontent.com/coreruleset/ftw-tests-schema/main/spec/v2.
|
|
7240
|
+
"url": "https://raw.githubusercontent.com/coreruleset/ftw-tests-schema/main/spec/v2.2.0/waf-tests-schema-v2.2.0.json",
|
|
7235
7241
|
"versions": {
|
|
7236
|
-
"2.
|
|
7242
|
+
"2.0.0": "https://raw.githubusercontent.com/coreruleset/ftw-tests-schema/main/spec/v2.0.0/waf-tests-schema-v2.0.0.json",
|
|
7243
|
+
"2.1.0": "https://raw.githubusercontent.com/coreruleset/ftw-tests-schema/main/spec/v2.1.0/waf-tests-schema-v2.1.0.json",
|
|
7244
|
+
"2.2.0": "https://raw.githubusercontent.com/coreruleset/ftw-tests-schema/main/spec/v2.2.0/waf-tests-schema-v2.2.0.json"
|
|
7237
7245
|
}
|
|
7238
7246
|
},
|
|
7239
7247
|
{
|
|
7240
7248
|
"name": "CRS WAF test platform overrides file",
|
|
7241
7249
|
"description": "Definition of platform specific overrides for WAF tests",
|
|
7242
7250
|
"fileMatch": ["*.wafto", ".wafto.yaml", ".wafto.yml"],
|
|
7243
|
-
"url": "https://raw.githubusercontent.com/coreruleset/ftw-tests-schema/master/spec/v2.
|
|
7251
|
+
"url": "https://raw.githubusercontent.com/coreruleset/ftw-tests-schema/master/spec/v2.2.0/waf-platform-overrides-schema-v2.2.0.json",
|
|
7244
7252
|
"versions": {
|
|
7245
|
-
"2.
|
|
7253
|
+
"2.0.0": "https://raw.githubusercontent.com/coreruleset/ftw-tests-schema/master/spec/v2.0.0/waf-platform-overrides-schema-v2.0.0.json",
|
|
7254
|
+
"2.1.0": "https://raw.githubusercontent.com/coreruleset/ftw-tests-schema/master/spec/v2.1.0/waf-platform-overrides-schema-v2.1.0.json",
|
|
7255
|
+
"2.2.0": "https://raw.githubusercontent.com/coreruleset/ftw-tests-schema/master/spec/v2.2.0/waf-platform-overrides-schema-v2.2.0.json"
|
|
7246
7256
|
}
|
|
7247
7257
|
},
|
|
7248
7258
|
{
|
|
@@ -7491,6 +7501,12 @@
|
|
|
7491
7501
|
"description": "Wake - development, testing, and static analysis framework for Solidity",
|
|
7492
7502
|
"fileMatch": ["**/*wake.toml", "**/*.wake.toml"],
|
|
7493
7503
|
"url": "https://raw.githubusercontent.com/Ackee-Blockchain/wake/refs/heads/main/docs/wake-schema.json"
|
|
7504
|
+
},
|
|
7505
|
+
{
|
|
7506
|
+
"name": "Trident",
|
|
7507
|
+
"description": "Trident - Rust-based fuzzing framework for Solana programs to help ship secure code",
|
|
7508
|
+
"fileMatch": ["**/*Trident.toml", "**/*.Trident.toml"],
|
|
7509
|
+
"url": "https://raw.githubusercontent.com/Ackee-Blockchain/trident/refs/heads/master/trident-spec.json"
|
|
7494
7510
|
}
|
|
7495
7511
|
]
|
|
7496
7512
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger-frontend-module.d.ts","sourceRoot":"","sources":["../../src/browser/logger-frontend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAa,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"logger-frontend-module.d.ts","sourceRoot":"","sources":["../../src/browser/logger-frontend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAa,MAAM,WAAW,CAAC;AASvD,eAAO,MAAM,oBAAoB,iBAsC/B,CAAC"}
|
|
@@ -23,15 +23,14 @@ const logger_watcher_1 = require("../common/logger-watcher");
|
|
|
23
23
|
const messaging_1 = require("./messaging");
|
|
24
24
|
const frontend_application_contribution_1 = require("./frontend-application-contribution");
|
|
25
25
|
const rpc_message_encoder_1 = require("../common/message-rpc/rpc-message-encoder");
|
|
26
|
+
const logger_binding_1 = require("../common/logger-binding");
|
|
26
27
|
exports.loggerFrontendModule = new inversify_1.ContainerModule(bind => {
|
|
27
28
|
bind(frontend_application_contribution_1.FrontendApplicationContribution).toDynamicValue(ctx => ({
|
|
28
29
|
initialize() {
|
|
29
30
|
(0, logger_1.setRootLogger)(ctx.container.get(logger_1.ILogger));
|
|
30
31
|
}
|
|
31
32
|
}));
|
|
32
|
-
|
|
33
|
-
bind(logger_1.ILogger).to(logger_1.Logger).inSingletonScope().whenTargetIsDefault();
|
|
34
|
-
bind(logger_watcher_1.LoggerWatcher).toSelf().inSingletonScope();
|
|
33
|
+
(0, logger_binding_1.bindCommonLogger)(bind);
|
|
35
34
|
bind(logger_protocol_1.ILoggerServer).toDynamicValue(ctx => {
|
|
36
35
|
const loggerWatcher = ctx.container.get(logger_watcher_1.LoggerWatcher);
|
|
37
36
|
const connection = ctx.container.get(messaging_1.WebSocketConnectionProvider);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger-frontend-module.js","sourceRoot":"","sources":["../../src/browser/logger-frontend-module.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAEhF,yCAAuD;AACvD,+DAAqF;AACrF,
|
|
1
|
+
{"version":3,"file":"logger-frontend-module.js","sourceRoot":"","sources":["../../src/browser/logger-frontend-module.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAEhF,yCAAuD;AACvD,+DAAqF;AACrF,6CAA6F;AAC7F,6DAAyD;AACzD,2CAA0D;AAC1D,2FAAsF;AACtF,mFAA0E;AAC1E,6DAA4D;AAE/C,QAAA,oBAAoB,GAAG,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;IAC3D,IAAI,CAAC,mEAA+B,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACzD,UAAU;YACN,IAAA,sBAAa,EAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAU,gBAAO,CAAC,CAAC,CAAC;QACvD,CAAC;KACJ,CAAC,CAAC,CAAC;IAEJ,IAAA,iCAAgB,EAAC,IAAI,CAAC,CAAC;IACvB,IAAI,CAAC,+BAAa,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;QACrC,MAAM,aAAa,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,8BAAa,CAAC,CAAC;QACvD,MAAM,UAAU,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,uCAA2B,CAAC,CAAC;QAClE,MAAM,MAAM,GAAG,UAAU,CAAC,WAAW,CAAgB,4BAAU,EAAE,aAAa,CAAC,eAAe,EAAE,CAAC,CAAC;QAClG,SAAS,GAAG,CAAgC,CAAgB,EAAE,QAAW;YACrE,IAAI,QAAQ,KAAK,KAAK,EAAE,CAAC;gBACrB,OAAO,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;oBACvC,+BAAa,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;oBACnD,OAAO,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;wBAC3D,IAAI,GAAG,YAAY,mCAAa,EAAE,CAAC;4BAC/B,8HAA8H;4BAC9H,OAAO;wBACX,CAAC;wBACD,MAAM,GAAG,CAAC;oBACd,CAAC,CAAC,CAAC;gBACP,CAAC,CAAC;YACN,CAAC;YACD,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC5B,CAAC;QACD,OAAO,IAAI,KAAK,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACtB,IAAI,CAAC,sBAAa,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAChC,CAAC,IAAY,EAAE,EAAE;QACb,MAAM,KAAK,GAAG,IAAI,qBAAS,CAAC,EAAE,YAAY,EAAE,WAAW,EAAE,CAAC,CAAC;QAC3D,KAAK,CAAC,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC;QAC7B,KAAK,CAAC,IAAI,CAAC,gBAAO,CAAC,CAAC,EAAE,CAAC,eAAM,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAClD,KAAK,CAAC,IAAI,CAAC,mBAAU,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAC7C,OAAO,KAAK,CAAC,GAAG,CAAC,gBAAO,CAAC,CAAC;IAC9B,CAAC,CACJ,CAAC;AACN,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logger-binding.d.ts","sourceRoot":"","sources":["../../src/common/logger-binding.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAIvC,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,GAAG,IAAI,CAQ5D"}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// *****************************************************************************
|
|
3
|
+
// Copyright (C) 2025 TypeFox and others.
|
|
4
|
+
//
|
|
5
|
+
// This program and the accompanying materials are made available under the
|
|
6
|
+
// terms of the Eclipse Public License v. 2.0 which is available at
|
|
7
|
+
// http://www.eclipse.org/legal/epl-2.0.
|
|
8
|
+
//
|
|
9
|
+
// This Source Code may also be made available under the following Secondary
|
|
10
|
+
// Licenses when the conditions for such availability set forth in the Eclipse
|
|
11
|
+
// Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
12
|
+
// with the GNU Classpath Exception which is available at
|
|
13
|
+
// https://www.gnu.org/software/classpath/license.html.
|
|
14
|
+
//
|
|
15
|
+
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
|
+
// *****************************************************************************
|
|
17
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
+
exports.bindCommonLogger = void 0;
|
|
19
|
+
const logger_1 = require("./logger");
|
|
20
|
+
const logger_watcher_1 = require("./logger-watcher");
|
|
21
|
+
function bindCommonLogger(bind) {
|
|
22
|
+
bind(logger_1.LoggerName).toConstantValue(logger_1.rootLoggerName);
|
|
23
|
+
bind(logger_1.ILogger).to(logger_1.Logger).inSingletonScope().when(request => getName(request) === undefined);
|
|
24
|
+
bind(logger_1.ILogger).toDynamicValue(ctx => {
|
|
25
|
+
const logger = ctx.container.get(logger_1.ILogger);
|
|
26
|
+
return logger.child(getName(ctx.currentRequest));
|
|
27
|
+
}).when(request => getName(request) !== undefined);
|
|
28
|
+
bind(logger_watcher_1.LoggerWatcher).toSelf().inSingletonScope();
|
|
29
|
+
}
|
|
30
|
+
exports.bindCommonLogger = bindCommonLogger;
|
|
31
|
+
function getName(request) {
|
|
32
|
+
var _a;
|
|
33
|
+
const named = request.target.metadata.find(e => e.key === 'named');
|
|
34
|
+
return named ? (_a = named.value) === null || _a === void 0 ? void 0 : _a.toString() : undefined;
|
|
35
|
+
}
|
|
36
|
+
//# sourceMappingURL=logger-binding.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logger-binding.js","sourceRoot":"","sources":["../../src/common/logger-binding.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAGhF,qCAAuE;AACvE,qDAAiD;AAEjD,SAAgB,gBAAgB,CAAC,IAAqB;IAClD,IAAI,CAAC,mBAAU,CAAC,CAAC,eAAe,CAAC,uBAAc,CAAC,CAAC;IACjD,IAAI,CAAC,gBAAO,CAAC,CAAC,EAAE,CAAC,eAAM,CAAC,CAAC,gBAAgB,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,SAAS,CAAC,CAAC;IAC5F,IAAI,CAAC,gBAAO,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;QAC/B,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAU,gBAAO,CAAC,CAAC;QACnD,OAAO,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAE,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,SAAS,CAAC,CAAC;IACnD,IAAI,CAAC,8BAAa,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;AACpD,CAAC;AARD,4CAQC;AAED,SAAS,OAAO,CAAC,OAA2B;;IACxC,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,OAAO,CAAC,CAAC;IACnE,OAAO,KAAK,CAAC,CAAC,CAAC,MAAA,KAAK,CAAC,KAAK,0CAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;AACvD,CAAC"}
|
|
@@ -37,6 +37,6 @@ export declare namespace LogLevel {
|
|
|
37
37
|
}
|
|
38
38
|
export declare namespace ConsoleLogger {
|
|
39
39
|
function reset(): void;
|
|
40
|
-
function log(name: string, logLevel: number, message: string, params: any[]):
|
|
40
|
+
function log(name: string, logLevel: number, message: string, params: any[]): string;
|
|
41
41
|
}
|
|
42
42
|
//# sourceMappingURL=logger-protocol.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger-protocol.d.ts","sourceRoot":"","sources":["../../src/common/logger-protocol.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAEtD,eAAO,MAAM,aAAa,eAA0B,CAAC;AAErD,eAAO,MAAM,UAAU,qBAAqB,CAAC;AAE7C,MAAM,WAAW,aAAc,SAAQ,SAAS,CAAC,aAAa,CAAC;IAC3D,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3D,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAE3C,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAChF,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACtC;AAED,eAAO,MAAM,aAAa,eAA0B,CAAC;AAErD,MAAM,WAAW,qBAAqB;IAClC,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,aAAa;IAC1B,iBAAiB,CAAC,KAAK,EAAE,qBAAqB,GAAG,IAAI,CAAC;IACtD,kBAAkB,IAAI,IAAI,CAAC;CAC9B;AAED,qBACa,uBAAwB,YAAW,aAAa;IAEzD,QAAQ,CAAC,OAAO,qBAA4B;IAE5C,iBAAiB,CAAC,KAAK,EAAE,qBAAqB,GAAG,IAAI;IAIrD,kBAAkB,IAAI,IAAI;CAG7B;AAED,eAAO,MAAM,cAAc,SAAS,CAAC;AAErC,oBAAY,QAAQ;IAChB,KAAK,KAAK;IACV,KAAK,KAAK;IACV,IAAI,KAAK;IACT,IAAI,KAAK;IACT,KAAK,KAAK;IACV,KAAK,KAAK;CACb;AACD,yBAAiB,QAAQ,CAAC;IACf,MAAM,OAAO,uBAOlB,CAAC;IAEH,SAAgB,QAAQ,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM,GAAG,SAAS,CAE5D;IAED,SAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CAQjE;CACJ;AAGD,yBAAiB,aAAa,CAAC;IAW3B,SAAgB,KAAK,IAAI,IAAI,CAO5B;IACD,SAAgB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,
|
|
1
|
+
{"version":3,"file":"logger-protocol.d.ts","sourceRoot":"","sources":["../../src/common/logger-protocol.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAEtD,eAAO,MAAM,aAAa,eAA0B,CAAC;AAErD,eAAO,MAAM,UAAU,qBAAqB,CAAC;AAE7C,MAAM,WAAW,aAAc,SAAQ,SAAS,CAAC,aAAa,CAAC;IAC3D,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3D,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAE3C,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAChF,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACtC;AAED,eAAO,MAAM,aAAa,eAA0B,CAAC;AAErD,MAAM,WAAW,qBAAqB;IAClC,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,aAAa;IAC1B,iBAAiB,CAAC,KAAK,EAAE,qBAAqB,GAAG,IAAI,CAAC;IACtD,kBAAkB,IAAI,IAAI,CAAC;CAC9B;AAED,qBACa,uBAAwB,YAAW,aAAa;IAEzD,QAAQ,CAAC,OAAO,qBAA4B;IAE5C,iBAAiB,CAAC,KAAK,EAAE,qBAAqB,GAAG,IAAI;IAIrD,kBAAkB,IAAI,IAAI;CAG7B;AAED,eAAO,MAAM,cAAc,SAAS,CAAC;AAErC,oBAAY,QAAQ;IAChB,KAAK,KAAK;IACV,KAAK,KAAK;IACV,IAAI,KAAK;IACT,IAAI,KAAK;IACT,KAAK,KAAK;IACV,KAAK,KAAK;CACb;AACD,yBAAiB,QAAQ,CAAC;IACf,MAAM,OAAO,uBAOlB,CAAC;IAEH,SAAgB,QAAQ,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM,GAAG,SAAS,CAE5D;IAED,SAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CAQjE;CACJ;AAGD,yBAAiB,aAAa,CAAC;IAW3B,SAAgB,KAAK,IAAI,IAAI,CAO5B;IACD,SAAgB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,CAO1F;CACJ"}
|
|
@@ -94,7 +94,9 @@ var ConsoleLogger;
|
|
|
94
94
|
const console = consoles.get(logLevel) || originalConsoleLog;
|
|
95
95
|
const severity = (LogLevel.strings.get(logLevel) || 'unknown').toUpperCase();
|
|
96
96
|
const now = new Date();
|
|
97
|
-
|
|
97
|
+
const formattedMessage = `${now.toISOString()} ${name} ${severity} ${message}`;
|
|
98
|
+
console(formattedMessage, ...params);
|
|
99
|
+
return formattedMessage;
|
|
98
100
|
}
|
|
99
101
|
ConsoleLogger.log = log;
|
|
100
102
|
})(ConsoleLogger || (exports.ConsoleLogger = ConsoleLogger = {}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger-protocol.js","sourceRoot":"","sources":["../../src/common/logger-protocol.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,yCAAuC;AAG1B,QAAA,aAAa,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC;AAExC,QAAA,UAAU,GAAG,kBAAkB,CAAC;AAUhC,QAAA,aAAa,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC;AAa9C,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAA7B;QAEM,YAAO,GAAG,IAAI,GAAG,EAAiB,CAAC;IAShD,CAAC;IAPG,iBAAiB,CAAC,KAA4B;QAC1C,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;IACpE,CAAC;IAED,kBAAkB;QACd,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC,CAAC;IAChE,CAAC;CACJ,CAAA;AAXY,0DAAuB;kCAAvB,uBAAuB;IADnC,IAAA,sBAAU,GAAE;GACA,uBAAuB,CAWnC;AAEY,QAAA,cAAc,GAAG,MAAM,CAAC;AAErC,IAAY,QAOX;AAPD,WAAY,QAAQ;IAChB,0CAAU,CAAA;IACV,0CAAU,CAAA;IACV,wCAAS,CAAA;IACT,wCAAS,CAAA;IACT,0CAAU,CAAA;IACV,0CAAU,CAAA;AACd,CAAC,EAPW,QAAQ,wBAAR,QAAQ,QAOnB;AACD,WAAiB,QAAQ;IACR,gBAAO,GAAG,IAAI,GAAG,CAAmB;QAC7C,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;QACzB,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;QACzB,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QACvB,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QACvB,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;QACzB,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;KAC5B,CAAC,CAAC;IAEH,SAAgB,QAAQ,CAAC,KAAe;QACpC,OAAO,SAAA,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;IAFe,iBAAQ,WAEvB,CAAA;IAED,SAAgB,UAAU,CAAC,QAAgB;QACvC,KAAK,MAAM,IAAI,IAAI,SAAA,OAAO,EAAE,CAAC;YACzB,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE,CAAC;gBACvB,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC;YACnB,CAAC;QACL,CAAC;QAED,OAAO,SAAS,CAAC;IACrB,CAAC;IARe,mBAAU,aAQzB,CAAA;AACL,CAAC,EAvBgB,QAAQ,wBAAR,QAAQ,QAuBxB;AAED,uDAAuD;AACvD,IAAiB,aAAa,
|
|
1
|
+
{"version":3,"file":"logger-protocol.js","sourceRoot":"","sources":["../../src/common/logger-protocol.ts"],"names":[],"mappings":"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"}
|
package/lib/common/logger.d.ts
CHANGED
|
@@ -177,6 +177,7 @@ export declare class Logger implements ILogger {
|
|
|
177
177
|
protected readonly loggerWatcher: LoggerWatcher;
|
|
178
178
|
protected readonly factory: LoggerFactory;
|
|
179
179
|
protected name: string;
|
|
180
|
+
protected cache: Map<string, ILogger>;
|
|
180
181
|
protected init(): void;
|
|
181
182
|
setLogLevel(logLevel: number): Promise<void>;
|
|
182
183
|
getLogLevel(): Promise<number>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/common/logger.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAiB,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAI3F,OAAO,EACH,QAAQ,EAAE,cAAc,EAC3B,CAAC;AAGF,eAAO,IAAI,MAAM,EAAE,OAAO,CAAC;AAE3B;;;;GAIG;AACH,wBAAgB,eAAe,IAAI,IAAI,CAKtC;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAWpD;AAED,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;AAC3D,MAAM,MAAM,QAAQ,GAAG,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,CAAC;AAE1C,eAAO,MAAM,aAAa,eAA0B,CAAC;AACrD,MAAM,MAAM,aAAa,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;AAEtD,eAAO,MAAM,UAAU,eAAuB,CAAC;AAE/C,eAAO,MAAM,OAAO,eAAoB,CAAC;AAEzC,MAAM,WAAW,OAAO;IACpB;;;;;OAKG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC5C;;;;OAIG;IACH,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAE/B;;OAEG;IACH,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9C;;OAEG;IACH,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C;;OAEG;IACH,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACzD;;;;;;OAMG;IACH,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAE5D;;OAEG;IACH,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5B;;OAEG;IACH,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB;;OAEG;IACH,KAAK,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACzC;;;;;OAKG;IACH,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAErD;;OAEG;IACH,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5B;;OAEG;IACH,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB;;OAEG;IACH,KAAK,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACzC;;;;;OAKG;IACH,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAErD;;OAEG;IACH,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC3B;;OAEG;IACH,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACxB;;OAEG;IACH,IAAI,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxC;;;;;OAKG;IACH,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEpD;;OAEG;IACH,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC3B;;OAEG;IACH,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACxB;;OAEG;IACH,IAAI,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxC;;;;;OAKG;IACH,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEpD;;OAEG;IACH,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5B;;OAEG;IACH,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB;;OAEG;IACH,KAAK,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACzC;;;;;OAKG;IACH,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAErD;;OAEG;IACH,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5B;;OAEG;IACH,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB;;OAEG;IACH,KAAK,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACzC;;;;;OAKG;IACH,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAErD;;;;OAIG;IACH,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;CAChC;AAED,qBACa,MAAO,YAAW,OAAO;IAGlC,SAAS,CAAC,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IAGrC,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAEV,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC;IACzC,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAChD,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC;IAC7C,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/common/logger.ts"],"names":[],"mappings":"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"}
|
package/lib/common/logger.js
CHANGED
|
@@ -49,6 +49,9 @@ exports.LoggerFactory = Symbol('LoggerFactory');
|
|
|
49
49
|
exports.LoggerName = Symbol('LoggerName');
|
|
50
50
|
exports.ILogger = Symbol('ILogger');
|
|
51
51
|
let Logger = class Logger {
|
|
52
|
+
constructor() {
|
|
53
|
+
this.cache = new Map();
|
|
54
|
+
}
|
|
52
55
|
init() {
|
|
53
56
|
if (this.name !== logger_protocol_1.rootLoggerName) {
|
|
54
57
|
/* Creating a child logger. */
|
|
@@ -173,7 +176,15 @@ let Logger = class Logger {
|
|
|
173
176
|
return this.log(logger_protocol_1.LogLevel.FATAL, arg, ...params);
|
|
174
177
|
}
|
|
175
178
|
child(name) {
|
|
176
|
-
|
|
179
|
+
const existing = this.cache.get(name);
|
|
180
|
+
if (existing) {
|
|
181
|
+
return existing;
|
|
182
|
+
}
|
|
183
|
+
else {
|
|
184
|
+
const child = this.factory(name);
|
|
185
|
+
this.cache.set(name, child);
|
|
186
|
+
return child;
|
|
187
|
+
}
|
|
177
188
|
}
|
|
178
189
|
};
|
|
179
190
|
exports.Logger = Logger;
|
package/lib/common/logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/common/logger.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,yCAA8D;AAC9D,qDAAiD;AACjD,uDAA2F;AAKvF,yFALoB,0BAAQ,OAKpB;AAAE,+FALmC,gCAAc,OAKnC;AAM5B;;;;GAIG;AACH,SAAgB,eAAe;IAC3B,IAAI,cAAM,KAAK,SAAS,EAAE,CAAC;QACvB,+BAAa,CAAC,KAAK,EAAE,CAAC;QAChB,cAAO,GAAG,SAAS,CAAC;IAC9B,CAAC;AACL,CAAC;AALD,0CAKC;AAED,SAAgB,aAAa,CAAC,OAAgB;IAC1C,cAAM,GAAG,OAAO,CAAC;IACjB,MAAM,GAAG,GAAG,CAAC,QAAgB,EAAE,OAAa,EAAE,GAAG,cAAqB,EAAE,EAAE,CACtE,cAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC,CAAC;IAErD,OAAO,CAAC,KAAK,GAAG,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,0BAAQ,CAAC,KAAK,CAAC,CAAC;IACpD,OAAO,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,0BAAQ,CAAC,IAAI,CAAC,CAAC;IAClD,OAAO,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,0BAAQ,CAAC,IAAI,CAAC,CAAC;IAClD,OAAO,CAAC,KAAK,GAAG,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,0BAAQ,CAAC,KAAK,CAAC,CAAC;IACpD,OAAO,CAAC,KAAK,GAAG,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,0BAAQ,CAAC,KAAK,CAAC,CAAC;IACpD,OAAO,CAAC,GAAG,GAAG,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,0BAAQ,CAAC,IAAI,CAAC,CAAC;AACrD,CAAC;AAXD,sCAWC;AAKY,QAAA,aAAa,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC;AAGxC,QAAA,UAAU,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;AAElC,QAAA,OAAO,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;AAuKlC,IAAM,MAAM,GAAZ,MAAM,MAAM;
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/common/logger.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,18 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
1
2
|
import { LoggerWatcher } from '../common/logger-watcher';
|
|
2
3
|
import { LogLevelCliContribution } from './logger-cli-contribution';
|
|
3
4
|
import { ILoggerServer, ILoggerClient } from '../common/logger-protocol';
|
|
5
|
+
import * as fs from 'fs';
|
|
4
6
|
export declare class ConsoleLoggerServer implements ILoggerServer {
|
|
5
|
-
protected client
|
|
7
|
+
protected client?: ILoggerClient;
|
|
6
8
|
protected watcher: LoggerWatcher;
|
|
7
9
|
protected cli: LogLevelCliContribution;
|
|
10
|
+
protected logFileStream?: fs.WriteStream;
|
|
8
11
|
protected init(): void;
|
|
9
12
|
setLogLevel(name: string, newLogLevel: number): Promise<void>;
|
|
10
13
|
getLogLevel(name: string): Promise<number>;
|
|
11
14
|
log(name: string, logLevel: number, message: string, params: any[]): Promise<void>;
|
|
15
|
+
protected logToFile(message: string, params: any[]): void;
|
|
12
16
|
child(name: string): Promise<void>;
|
|
13
17
|
dispose(): void;
|
|
14
18
|
setClient(client: ILoggerClient | undefined): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"console-logger-server.d.ts","sourceRoot":"","sources":["../../src/node/console-logger-server.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAiC,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"console-logger-server.d.ts","sourceRoot":"","sources":["../../src/node/console-logger-server.ts"],"names":[],"mappings":";AAiBA,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAiC,MAAM,2BAA2B,CAAC;AAGxG,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AAEzB,qBACa,mBAAoB,YAAW,aAAa;IAErD,SAAS,CAAC,MAAM,CAAC,EAAE,aAAa,CAAC;IAGjC,SAAS,CAAC,OAAO,EAAE,aAAa,CAAC;IAGjC,SAAS,CAAC,GAAG,EAAE,uBAAuB,CAAC;IAEvC,SAAS,CAAC,aAAa,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC;IAGzC,SAAS,CAAC,IAAI,IAAI,IAAI;IAUhB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAU7D,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAK1C,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAQxF,SAAS,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;IAcnD,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIxC,OAAO,IAAI,IAAI;IAEf,SAAS,CAAC,MAAM,EAAE,aAAa,GAAG,SAAS,GAAG,IAAI;CAIrD"}
|
|
@@ -21,10 +21,10 @@ const inversify_1 = require("inversify");
|
|
|
21
21
|
const logger_watcher_1 = require("../common/logger-watcher");
|
|
22
22
|
const logger_cli_contribution_1 = require("./logger-cli-contribution");
|
|
23
23
|
const logger_protocol_1 = require("../common/logger-protocol");
|
|
24
|
+
const util_1 = require("util");
|
|
25
|
+
const os_1 = require("os");
|
|
26
|
+
const fs = require("fs");
|
|
24
27
|
let ConsoleLoggerServer = class ConsoleLoggerServer {
|
|
25
|
-
constructor() {
|
|
26
|
-
this.client = undefined;
|
|
27
|
-
}
|
|
28
28
|
init() {
|
|
29
29
|
this.setLogLevel(logger_protocol_1.rootLoggerName, this.cli.defaultLogLevel);
|
|
30
30
|
for (const name of Object.keys(this.cli.logLevels)) {
|
|
@@ -51,7 +51,21 @@ let ConsoleLoggerServer = class ConsoleLoggerServer {
|
|
|
51
51
|
async log(name, logLevel, message, params) {
|
|
52
52
|
const configuredLogLevel = await this.getLogLevel(name);
|
|
53
53
|
if (logLevel >= configuredLogLevel) {
|
|
54
|
-
logger_protocol_1.ConsoleLogger.log(name, logLevel, message, params);
|
|
54
|
+
const fullMessage = logger_protocol_1.ConsoleLogger.log(name, logLevel, message, params);
|
|
55
|
+
this.logToFile(fullMessage, params);
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
logToFile(message, params) {
|
|
59
|
+
if (this.cli.logFile && !this.logFileStream) {
|
|
60
|
+
this.logFileStream = fs.createWriteStream(this.cli.logFile, { flags: 'a' });
|
|
61
|
+
// Only log errors once to avoid spamming the console
|
|
62
|
+
this.logFileStream.once('error', error => {
|
|
63
|
+
console.error(`Error writing to log file ${this.cli.logFile}`, error);
|
|
64
|
+
});
|
|
65
|
+
}
|
|
66
|
+
if (this.logFileStream) {
|
|
67
|
+
const formatted = (0, util_1.format)(message, ...params) + os_1.EOL;
|
|
68
|
+
this.logFileStream.write(formatted);
|
|
55
69
|
}
|
|
56
70
|
}
|
|
57
71
|
async child(name) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"console-logger-server.js","sourceRoot":"","sources":["../../src/node/console-logger-server.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,yCAA8D;AAC9D,6DAAyD;AACzD,uEAAoE;AACpE,+DAAwG;
|
|
1
|
+
{"version":3,"file":"console-logger-server.js","sourceRoot":"","sources":["../../src/node/console-logger-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger-backend-module.d.ts","sourceRoot":"","sources":["../../src/node/logger-backend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAa,UAAU,EAAE,MAAM,WAAW,CAAC;AAGnE,OAAO,EAAE,aAAa,EAAsD,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"logger-backend-module.d.ts","sourceRoot":"","sources":["../../src/node/logger-backend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAa,UAAU,EAAE,MAAM,WAAW,CAAC;AAGnE,OAAO,EAAE,aAAa,EAAsD,MAAM,2BAA2B,CAAC;AAQ9G,wBAAgB,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE;IACtD,wBAAwB,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,KAAK,IAAI,CAAA;CAC1F,GAAG,IAAI,CAmBP;AAED;;GAEG;AACH,eAAO,MAAM,mBAAmB,iBAiC9B,CAAC"}
|
|
@@ -25,10 +25,9 @@ const logger_watcher_1 = require("../common/logger-watcher");
|
|
|
25
25
|
const backend_application_1 = require("./backend-application");
|
|
26
26
|
const cli_1 = require("./cli");
|
|
27
27
|
const logger_cli_contribution_1 = require("./logger-cli-contribution");
|
|
28
|
+
const logger_binding_1 = require("../common/logger-binding");
|
|
28
29
|
function bindLogger(bind, props) {
|
|
29
|
-
|
|
30
|
-
bind(logger_1.ILogger).to(logger_1.Logger).inSingletonScope().whenTargetIsDefault();
|
|
31
|
-
bind(logger_watcher_1.LoggerWatcher).toSelf().inSingletonScope();
|
|
30
|
+
(0, logger_binding_1.bindCommonLogger)(bind);
|
|
32
31
|
bind(logger_protocol_1.ILoggerServer).to(console_logger_server_1.ConsoleLoggerServer).inSingletonScope().onActivation((context, server) => {
|
|
33
32
|
if (props && props.onLoggerServerActivation) {
|
|
34
33
|
props.onLoggerServerActivation(context, server);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger-backend-module.js","sourceRoot":"","sources":["../../src/node/logger-backend-module.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAEhF,yCAAmE;AACnE,mDAA8E;AAC9E,
|
|
1
|
+
{"version":3,"file":"logger-backend-module.js","sourceRoot":"","sources":["../../src/node/logger-backend-module.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,9 +17,11 @@ export declare class LogLevelCliContribution implements CliContribution {
|
|
|
17
17
|
* Log level to use for loggers not specified in `logLevels`.
|
|
18
18
|
*/
|
|
19
19
|
protected _defaultLogLevel: LogLevel;
|
|
20
|
+
protected _logFile?: string;
|
|
20
21
|
protected logConfigChangedEvent: Emitter<void>;
|
|
21
22
|
get defaultLogLevel(): LogLevel;
|
|
22
23
|
get logLevels(): LogLevels;
|
|
24
|
+
get logFile(): string | undefined;
|
|
23
25
|
configure(conf: yargs.Argv): void;
|
|
24
26
|
setArguments(args: yargs.Arguments): Promise<void>;
|
|
25
27
|
protected watchLogConfigFile(filename: string): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger-cli-contribution.d.ts","sourceRoot":"","sources":["../../src/node/logger-cli-contribution.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AAGxC,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAGjD,wCAAwC;AACxC,MAAM,WAAW,SAAS;IACtB,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,CAAC;CAC3B;AAED;;;;GAIG;AACH,qBACa,uBAAwB,YAAW,eAAe;IAE3D,SAAS,CAAC,UAAU,EAAE,SAAS,CAAM;IAErC;;OAEG;IACH,SAAS,CAAC,gBAAgB,EAAE,QAAQ,CAAiB;IAErD,SAAS,CAAC,qBAAqB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAuB;IAErE,IAAI,eAAe,IAAI,QAAQ,CAE9B;IAED,IAAI,SAAS,IAAI,SAAS,CAEzB;IAED,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"logger-cli-contribution.d.ts","sourceRoot":"","sources":["../../src/node/logger-cli-contribution.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AAGxC,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAGjD,wCAAwC;AACxC,MAAM,WAAW,SAAS;IACtB,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,CAAC;CAC3B;AAED;;;;GAIG;AACH,qBACa,uBAAwB,YAAW,eAAe;IAE3D,SAAS,CAAC,UAAU,EAAE,SAAS,CAAM;IAErC;;OAEG;IACH,SAAS,CAAC,gBAAgB,EAAE,QAAQ,CAAiB;IAErD,SAAS,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAE5B,SAAS,CAAC,qBAAqB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAuB;IAErE,IAAI,eAAe,IAAI,QAAQ,CAE9B;IAED,IAAI,SAAS,IAAI,SAAS,CAEzB;IAED,IAAI,OAAO,IAAI,MAAM,GAAG,SAAS,CAEhC;IAED,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,GAAG,IAAI;IAoB3B,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;cA2CxC,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAyBnD,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA8BnE,IAAI,kBAAkB,IAAI,KAAK,CAAC,IAAI,CAAC,CAEpC;IAED,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,QAAQ;IAUzC;;OAEG;IACH,SAAS,CAAC,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,QAAQ;CASrF"}
|
|
@@ -43,6 +43,9 @@ let LogLevelCliContribution = class LogLevelCliContribution {
|
|
|
43
43
|
get logLevels() {
|
|
44
44
|
return this._logLevels;
|
|
45
45
|
}
|
|
46
|
+
get logFile() {
|
|
47
|
+
return this._logFile;
|
|
48
|
+
}
|
|
46
49
|
configure(conf) {
|
|
47
50
|
conf.option('log-level', {
|
|
48
51
|
description: 'Sets the default log level',
|
|
@@ -54,6 +57,11 @@ let LogLevelCliContribution = class LogLevelCliContribution {
|
|
|
54
57
|
type: 'string',
|
|
55
58
|
nargs: 1,
|
|
56
59
|
});
|
|
60
|
+
conf.option('log-file', {
|
|
61
|
+
description: 'Path to the log file',
|
|
62
|
+
type: 'string',
|
|
63
|
+
nargs: 1
|
|
64
|
+
});
|
|
57
65
|
}
|
|
58
66
|
async setArguments(args) {
|
|
59
67
|
if (args['log-level'] !== undefined && args['log-config'] !== undefined) {
|
|
@@ -73,21 +81,46 @@ let LogLevelCliContribution = class LogLevelCliContribution {
|
|
|
73
81
|
console.error(`Error reading log config file ${filename}: ${e}`);
|
|
74
82
|
}
|
|
75
83
|
}
|
|
84
|
+
if (args['log-file'] !== undefined) {
|
|
85
|
+
let filename = args['log-file'];
|
|
86
|
+
try {
|
|
87
|
+
filename = path.resolve(filename);
|
|
88
|
+
try {
|
|
89
|
+
const stat = await fs.stat(filename);
|
|
90
|
+
if (stat && stat.isFile()) {
|
|
91
|
+
// Rename the previous log file to avoid overwriting it
|
|
92
|
+
const oldFilename = `${filename}.${stat.ctime.toISOString().replace(/:/g, '-')}.old`;
|
|
93
|
+
await fs.rename(filename, oldFilename);
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
catch {
|
|
97
|
+
// File does not exist, just continue to create it
|
|
98
|
+
}
|
|
99
|
+
await fs.writeFile(filename, '');
|
|
100
|
+
this._logFile = filename;
|
|
101
|
+
}
|
|
102
|
+
catch (e) {
|
|
103
|
+
console.error(`Error creating log file ${filename}: ${e}`);
|
|
104
|
+
}
|
|
105
|
+
}
|
|
76
106
|
}
|
|
77
107
|
async watchLogConfigFile(filename) {
|
|
78
|
-
|
|
108
|
+
const dir = path.dirname(filename);
|
|
109
|
+
await (0, watcher_1.subscribe)(dir, async (err, events) => {
|
|
79
110
|
if (err) {
|
|
80
111
|
console.log(`Error during log file watching ${filename}: ${err}`);
|
|
81
112
|
return;
|
|
82
113
|
}
|
|
83
114
|
try {
|
|
84
115
|
for (const event of events) {
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
116
|
+
if (event.path === filename) {
|
|
117
|
+
switch (event.type) {
|
|
118
|
+
case 'create':
|
|
119
|
+
case 'update':
|
|
120
|
+
await this.slurpLogConfigFile(filename);
|
|
121
|
+
this.logConfigChangedEvent.fire(undefined);
|
|
122
|
+
break;
|
|
123
|
+
}
|
|
91
124
|
}
|
|
92
125
|
}
|
|
93
126
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger-cli-contribution.js","sourceRoot":"","sources":["../../src/node/logger-cli-contribution.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAGhF,yCAAuC;AACvC,6CAA4C;AAE5C,+BAA+B;AAC/B,6CAA4C;AAC5C,2CAAiD;AACjD,6BAA6B;AAO7B;;;;GAIG;AAEI,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAA7B;QAEO,eAAU,GAAc,EAAE,CAAC;QAErC;;WAEG;QACO,qBAAgB,GAAa,iBAAQ,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"logger-cli-contribution.js","sourceRoot":"","sources":["../../src/node/logger-cli-contribution.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/core",
|
|
3
|
-
"version": "1.57.0-next.
|
|
3
|
+
"version": "1.57.0-next.136+9a2072774",
|
|
4
4
|
"description": "Theia is a cloud & desktop IDE framework implemented in TypeScript.",
|
|
5
5
|
"main": "lib/common/index.js",
|
|
6
6
|
"typings": "lib/common/index.d.ts",
|
|
@@ -17,8 +17,8 @@
|
|
|
17
17
|
"@phosphor/signaling": "1",
|
|
18
18
|
"@phosphor/virtualdom": "1",
|
|
19
19
|
"@phosphor/widgets": "1",
|
|
20
|
-
"@theia/application-package": "1.57.0-next.
|
|
21
|
-
"@theia/request": "1.57.0-next.
|
|
20
|
+
"@theia/application-package": "1.57.0-next.136+9a2072774",
|
|
21
|
+
"@theia/request": "1.57.0-next.136+9a2072774",
|
|
22
22
|
"@types/body-parser": "^1.16.4",
|
|
23
23
|
"@types/cookie": "^0.3.3",
|
|
24
24
|
"@types/dompurify": "^2.2.2",
|
|
@@ -218,5 +218,5 @@
|
|
|
218
218
|
"nyc": {
|
|
219
219
|
"extends": "../../configs/nyc.json"
|
|
220
220
|
},
|
|
221
|
-
"gitHead": "
|
|
221
|
+
"gitHead": "9a20727743172a4efa46334f4136a1242b160848"
|
|
222
222
|
}
|
|
@@ -16,11 +16,12 @@
|
|
|
16
16
|
|
|
17
17
|
import { ContainerModule, Container } from 'inversify';
|
|
18
18
|
import { ILoggerServer, loggerPath, ConsoleLogger } from '../common/logger-protocol';
|
|
19
|
-
import { ILogger, Logger, LoggerFactory, setRootLogger, LoggerName
|
|
19
|
+
import { ILogger, Logger, LoggerFactory, setRootLogger, LoggerName } from '../common/logger';
|
|
20
20
|
import { LoggerWatcher } from '../common/logger-watcher';
|
|
21
21
|
import { WebSocketConnectionProvider } from './messaging';
|
|
22
22
|
import { FrontendApplicationContribution } from './frontend-application-contribution';
|
|
23
23
|
import { EncodingError } from '../common/message-rpc/rpc-message-encoder';
|
|
24
|
+
import { bindCommonLogger } from '../common/logger-binding';
|
|
24
25
|
|
|
25
26
|
export const loggerFrontendModule = new ContainerModule(bind => {
|
|
26
27
|
bind(FrontendApplicationContribution).toDynamicValue(ctx => ({
|
|
@@ -29,9 +30,7 @@ export const loggerFrontendModule = new ContainerModule(bind => {
|
|
|
29
30
|
}
|
|
30
31
|
}));
|
|
31
32
|
|
|
32
|
-
bind
|
|
33
|
-
bind(ILogger).to(Logger).inSingletonScope().whenTargetIsDefault();
|
|
34
|
-
bind(LoggerWatcher).toSelf().inSingletonScope();
|
|
33
|
+
bindCommonLogger(bind);
|
|
35
34
|
bind(ILoggerServer).toDynamicValue(ctx => {
|
|
36
35
|
const loggerWatcher = ctx.container.get(LoggerWatcher);
|
|
37
36
|
const connection = ctx.container.get(WebSocketConnectionProvider);
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
// *****************************************************************************
|
|
2
|
+
// Copyright (C) 2025 TypeFox and others.
|
|
3
|
+
//
|
|
4
|
+
// This program and the accompanying materials are made available under the
|
|
5
|
+
// terms of the Eclipse Public License v. 2.0 which is available at
|
|
6
|
+
// http://www.eclipse.org/legal/epl-2.0.
|
|
7
|
+
//
|
|
8
|
+
// This Source Code may also be made available under the following Secondary
|
|
9
|
+
// Licenses when the conditions for such availability set forth in the Eclipse
|
|
10
|
+
// Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
11
|
+
// with the GNU Classpath Exception which is available at
|
|
12
|
+
// https://www.gnu.org/software/classpath/license.html.
|
|
13
|
+
//
|
|
14
|
+
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
|
+
// *****************************************************************************
|
|
16
|
+
|
|
17
|
+
import { interfaces } from 'inversify';
|
|
18
|
+
import { ILogger, Logger, LoggerName, rootLoggerName } from './logger';
|
|
19
|
+
import { LoggerWatcher } from './logger-watcher';
|
|
20
|
+
|
|
21
|
+
export function bindCommonLogger(bind: interfaces.Bind): void {
|
|
22
|
+
bind(LoggerName).toConstantValue(rootLoggerName);
|
|
23
|
+
bind(ILogger).to(Logger).inSingletonScope().when(request => getName(request) === undefined);
|
|
24
|
+
bind(ILogger).toDynamicValue(ctx => {
|
|
25
|
+
const logger = ctx.container.get<ILogger>(ILogger);
|
|
26
|
+
return logger.child(getName(ctx.currentRequest)!);
|
|
27
|
+
}).when(request => getName(request) !== undefined);
|
|
28
|
+
bind(LoggerWatcher).toSelf().inSingletonScope();
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
function getName(request: interfaces.Request): string | undefined {
|
|
32
|
+
const named = request.target.metadata.find(e => e.key === 'named');
|
|
33
|
+
return named ? named.value?.toString() : undefined;
|
|
34
|
+
}
|
|
@@ -110,10 +110,12 @@ export namespace ConsoleLogger {
|
|
|
110
110
|
console.trace = consoles.get(LogLevel.TRACE)!;
|
|
111
111
|
console.log = originalConsoleLog;
|
|
112
112
|
}
|
|
113
|
-
export function log(name: string, logLevel: number, message: string, params: any[]):
|
|
113
|
+
export function log(name: string, logLevel: number, message: string, params: any[]): string {
|
|
114
114
|
const console = consoles.get(logLevel) || originalConsoleLog;
|
|
115
115
|
const severity = (LogLevel.strings.get(logLevel) || 'unknown').toUpperCase();
|
|
116
116
|
const now = new Date();
|
|
117
|
-
|
|
117
|
+
const formattedMessage = `${now.toISOString()} ${name} ${severity} ${message}`;
|
|
118
|
+
console(formattedMessage, ...params);
|
|
119
|
+
return formattedMessage;
|
|
118
120
|
}
|
|
119
121
|
}
|
package/src/common/logger.ts
CHANGED
|
@@ -240,6 +240,8 @@ export class Logger implements ILogger {
|
|
|
240
240
|
@inject(LoggerFactory) protected readonly factory: LoggerFactory;
|
|
241
241
|
@inject(LoggerName) protected name: string;
|
|
242
242
|
|
|
243
|
+
protected cache = new Map<string, ILogger>();
|
|
244
|
+
|
|
243
245
|
@postConstruct()
|
|
244
246
|
protected init(): void {
|
|
245
247
|
if (this.name !== rootLoggerName) {
|
|
@@ -384,6 +386,13 @@ export class Logger implements ILogger {
|
|
|
384
386
|
}
|
|
385
387
|
|
|
386
388
|
child(name: string): ILogger {
|
|
387
|
-
|
|
389
|
+
const existing = this.cache.get(name);
|
|
390
|
+
if (existing) {
|
|
391
|
+
return existing;
|
|
392
|
+
} else {
|
|
393
|
+
const child = this.factory(name);
|
|
394
|
+
this.cache.set(name, child);
|
|
395
|
+
return child;
|
|
396
|
+
}
|
|
388
397
|
}
|
|
389
398
|
}
|
|
@@ -18,11 +18,14 @@ import { inject, injectable, postConstruct } from 'inversify';
|
|
|
18
18
|
import { LoggerWatcher } from '../common/logger-watcher';
|
|
19
19
|
import { LogLevelCliContribution } from './logger-cli-contribution';
|
|
20
20
|
import { ILoggerServer, ILoggerClient, ConsoleLogger, rootLoggerName } from '../common/logger-protocol';
|
|
21
|
+
import { format } from 'util';
|
|
22
|
+
import { EOL } from 'os';
|
|
23
|
+
import * as fs from 'fs';
|
|
21
24
|
|
|
22
25
|
@injectable()
|
|
23
26
|
export class ConsoleLoggerServer implements ILoggerServer {
|
|
24
27
|
|
|
25
|
-
protected client
|
|
28
|
+
protected client?: ILoggerClient;
|
|
26
29
|
|
|
27
30
|
@inject(LoggerWatcher)
|
|
28
31
|
protected watcher: LoggerWatcher;
|
|
@@ -30,6 +33,8 @@ export class ConsoleLoggerServer implements ILoggerServer {
|
|
|
30
33
|
@inject(LogLevelCliContribution)
|
|
31
34
|
protected cli: LogLevelCliContribution;
|
|
32
35
|
|
|
36
|
+
protected logFileStream?: fs.WriteStream;
|
|
37
|
+
|
|
33
38
|
@postConstruct()
|
|
34
39
|
protected init(): void {
|
|
35
40
|
this.setLogLevel(rootLoggerName, this.cli.defaultLogLevel);
|
|
@@ -59,7 +64,22 @@ export class ConsoleLoggerServer implements ILoggerServer {
|
|
|
59
64
|
async log(name: string, logLevel: number, message: string, params: any[]): Promise<void> {
|
|
60
65
|
const configuredLogLevel = await this.getLogLevel(name);
|
|
61
66
|
if (logLevel >= configuredLogLevel) {
|
|
62
|
-
ConsoleLogger.log(name, logLevel, message, params);
|
|
67
|
+
const fullMessage = ConsoleLogger.log(name, logLevel, message, params);
|
|
68
|
+
this.logToFile(fullMessage, params);
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
protected logToFile(message: string, params: any[]): void {
|
|
73
|
+
if (this.cli.logFile && !this.logFileStream) {
|
|
74
|
+
this.logFileStream = fs.createWriteStream(this.cli.logFile, { flags: 'a' });
|
|
75
|
+
// Only log errors once to avoid spamming the console
|
|
76
|
+
this.logFileStream.once('error', error => {
|
|
77
|
+
console.error(`Error writing to log file ${this.cli.logFile}`, error);
|
|
78
|
+
});
|
|
79
|
+
}
|
|
80
|
+
if (this.logFileStream) {
|
|
81
|
+
const formatted = format(message, ...params) + EOL;
|
|
82
|
+
this.logFileStream.write(formatted);
|
|
63
83
|
}
|
|
64
84
|
}
|
|
65
85
|
|
|
@@ -16,20 +16,19 @@
|
|
|
16
16
|
|
|
17
17
|
import { ContainerModule, Container, interfaces } from 'inversify';
|
|
18
18
|
import { ConnectionHandler, RpcConnectionHandler } from '../common/messaging';
|
|
19
|
-
import { ILogger, LoggerFactory, Logger, setRootLogger, LoggerName
|
|
19
|
+
import { ILogger, LoggerFactory, Logger, setRootLogger, LoggerName } from '../common/logger';
|
|
20
20
|
import { ILoggerServer, ILoggerClient, loggerPath, DispatchingLoggerClient } from '../common/logger-protocol';
|
|
21
21
|
import { ConsoleLoggerServer } from './console-logger-server';
|
|
22
22
|
import { LoggerWatcher } from '../common/logger-watcher';
|
|
23
23
|
import { BackendApplicationContribution } from './backend-application';
|
|
24
24
|
import { CliContribution } from './cli';
|
|
25
25
|
import { LogLevelCliContribution } from './logger-cli-contribution';
|
|
26
|
+
import { bindCommonLogger } from '../common/logger-binding';
|
|
26
27
|
|
|
27
28
|
export function bindLogger(bind: interfaces.Bind, props?: {
|
|
28
29
|
onLoggerServerActivation?: (context: interfaces.Context, server: ILoggerServer) => void
|
|
29
30
|
}): void {
|
|
30
|
-
bind
|
|
31
|
-
bind(ILogger).to(Logger).inSingletonScope().whenTargetIsDefault();
|
|
32
|
-
bind(LoggerWatcher).toSelf().inSingletonScope();
|
|
31
|
+
bindCommonLogger(bind);
|
|
33
32
|
bind<ILoggerServer>(ILoggerServer).to(ConsoleLoggerServer).inSingletonScope().onActivation((context, server) => {
|
|
34
33
|
if (props && props.onLoggerServerActivation) {
|
|
35
34
|
props.onLoggerServerActivation(context, server);
|
|
@@ -43,6 +43,8 @@ export class LogLevelCliContribution implements CliContribution {
|
|
|
43
43
|
*/
|
|
44
44
|
protected _defaultLogLevel: LogLevel = LogLevel.INFO;
|
|
45
45
|
|
|
46
|
+
protected _logFile?: string;
|
|
47
|
+
|
|
46
48
|
protected logConfigChangedEvent: Emitter<void> = new Emitter<void>();
|
|
47
49
|
|
|
48
50
|
get defaultLogLevel(): LogLevel {
|
|
@@ -53,6 +55,10 @@ export class LogLevelCliContribution implements CliContribution {
|
|
|
53
55
|
return this._logLevels;
|
|
54
56
|
}
|
|
55
57
|
|
|
58
|
+
get logFile(): string | undefined {
|
|
59
|
+
return this._logFile;
|
|
60
|
+
}
|
|
61
|
+
|
|
56
62
|
configure(conf: yargs.Argv): void {
|
|
57
63
|
conf.option('log-level', {
|
|
58
64
|
description: 'Sets the default log level',
|
|
@@ -65,6 +71,12 @@ export class LogLevelCliContribution implements CliContribution {
|
|
|
65
71
|
type: 'string',
|
|
66
72
|
nargs: 1,
|
|
67
73
|
});
|
|
74
|
+
|
|
75
|
+
conf.option('log-file', {
|
|
76
|
+
description: 'Path to the log file',
|
|
77
|
+
type: 'string',
|
|
78
|
+
nargs: 1
|
|
79
|
+
});
|
|
68
80
|
}
|
|
69
81
|
|
|
70
82
|
async setArguments(args: yargs.Arguments): Promise<void> {
|
|
@@ -87,22 +99,46 @@ export class LogLevelCliContribution implements CliContribution {
|
|
|
87
99
|
console.error(`Error reading log config file ${filename}: ${e}`);
|
|
88
100
|
}
|
|
89
101
|
}
|
|
102
|
+
|
|
103
|
+
if (args['log-file'] !== undefined) {
|
|
104
|
+
let filename = args['log-file'] as string;
|
|
105
|
+
try {
|
|
106
|
+
filename = path.resolve(filename);
|
|
107
|
+
try {
|
|
108
|
+
const stat = await fs.stat(filename);
|
|
109
|
+
if (stat && stat.isFile()) {
|
|
110
|
+
// Rename the previous log file to avoid overwriting it
|
|
111
|
+
const oldFilename = `${filename}.${stat.ctime.toISOString().replace(/:/g, '-')}.old`;
|
|
112
|
+
await fs.rename(filename, oldFilename);
|
|
113
|
+
}
|
|
114
|
+
} catch {
|
|
115
|
+
// File does not exist, just continue to create it
|
|
116
|
+
}
|
|
117
|
+
await fs.writeFile(filename, '');
|
|
118
|
+
this._logFile = filename;
|
|
119
|
+
} catch (e) {
|
|
120
|
+
console.error(`Error creating log file ${filename}: ${e}`);
|
|
121
|
+
}
|
|
122
|
+
}
|
|
90
123
|
}
|
|
91
124
|
|
|
92
125
|
protected async watchLogConfigFile(filename: string): Promise<void> {
|
|
93
|
-
|
|
126
|
+
const dir = path.dirname(filename);
|
|
127
|
+
await subscribe(dir, async (err, events) => {
|
|
94
128
|
if (err) {
|
|
95
129
|
console.log(`Error during log file watching ${filename}: ${err}`);
|
|
96
130
|
return;
|
|
97
131
|
}
|
|
98
132
|
try {
|
|
99
133
|
for (const event of events) {
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
134
|
+
if (event.path === filename) {
|
|
135
|
+
switch (event.type) {
|
|
136
|
+
case 'create':
|
|
137
|
+
case 'update':
|
|
138
|
+
await this.slurpLogConfigFile(filename);
|
|
139
|
+
this.logConfigChangedEvent.fire(undefined);
|
|
140
|
+
break;
|
|
141
|
+
}
|
|
106
142
|
}
|
|
107
143
|
}
|
|
108
144
|
} catch (e) {
|