egg 3.17.6 → 3.18.0
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/index.d.ts +1 -1
- package/lib/core/logger.js +14 -4
- package/package.json +3 -2
package/index.d.ts
CHANGED
|
@@ -573,7 +573,7 @@ declare module 'egg' {
|
|
|
573
573
|
methods: string[];
|
|
574
574
|
}
|
|
575
575
|
|
|
576
|
-
export interface EggApplication extends EggCoreBase<EggAppConfig> {
|
|
576
|
+
export interface EggApplication extends Omit<EggCoreBase<EggAppConfig>, 'ctxStorage' | 'currentContext'> {
|
|
577
577
|
/**
|
|
578
578
|
* HttpClient instance
|
|
579
579
|
*/
|
package/lib/core/logger.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
const Loggers = require('egg-logger').EggLoggers;
|
|
1
|
+
const { EggLoggers } = require('egg-logger');
|
|
2
|
+
const { setCustomLogger } = require('onelogger');
|
|
4
3
|
|
|
5
4
|
module.exports = function createLoggers(app) {
|
|
6
5
|
const loggerConfig = app.config.logger;
|
|
@@ -11,7 +10,7 @@ module.exports = function createLoggers(app) {
|
|
|
11
10
|
loggerConfig.level = 'INFO';
|
|
12
11
|
}
|
|
13
12
|
|
|
14
|
-
const loggers = new
|
|
13
|
+
const loggers = new EggLoggers(app.config);
|
|
15
14
|
|
|
16
15
|
// won't print to console after started, except for local and unittest
|
|
17
16
|
app.ready(() => {
|
|
@@ -19,6 +18,17 @@ module.exports = function createLoggers(app) {
|
|
|
19
18
|
loggers.disableConsole();
|
|
20
19
|
}
|
|
21
20
|
});
|
|
21
|
+
|
|
22
|
+
// set global logger
|
|
23
|
+
for (const loggerName of Object.keys(loggers)) {
|
|
24
|
+
setCustomLogger(loggerName, loggers[loggerName]);
|
|
25
|
+
}
|
|
26
|
+
// reset global logger on beforeClose hook
|
|
27
|
+
app.beforeClose(() => {
|
|
28
|
+
for (const loggerName of Object.keys(loggers)) {
|
|
29
|
+
setCustomLogger(loggerName, undefined);
|
|
30
|
+
}
|
|
31
|
+
});
|
|
22
32
|
loggers.coreLogger.info('[egg:logger] init all loggers with options: %j', loggerConfig);
|
|
23
33
|
|
|
24
34
|
return loggers;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "egg",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.18.0",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"tag": "latest"
|
|
6
6
|
},
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
"delegates": "^1.0.0",
|
|
28
28
|
"egg-cluster": "^2.0.0",
|
|
29
29
|
"egg-cookies": "^2.6.1",
|
|
30
|
-
"egg-core": "^5.
|
|
30
|
+
"egg-core": "^5.4.0",
|
|
31
31
|
"egg-development": "^2.7.0",
|
|
32
32
|
"egg-errors": "^2.3.1",
|
|
33
33
|
"egg-i18n": "^2.1.1",
|
|
@@ -51,6 +51,7 @@
|
|
|
51
51
|
"koa-override": "^3.0.0",
|
|
52
52
|
"ms": "^2.1.3",
|
|
53
53
|
"on-finished": "^2.4.1",
|
|
54
|
+
"onelogger": "^1.0.0",
|
|
54
55
|
"sendmessage": "^2.0.0",
|
|
55
56
|
"urllib": "^2.33.0",
|
|
56
57
|
"urllib-next": "^3.9.0",
|