Skip to content

Commit 8be04b7

Browse files
committed
fix(common): Fix error on requestContext that disable logs
Closes: #764
1 parent 1da7b3c commit 8be04b7

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

packages/common/src/mvc/models/RequestContext.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,6 @@ export class RequestContext extends Map<any, any> {
8383
}
8484

8585
async emit(eventName: string, ...args: any[]) {
86-
return this.injector && this.injector.emit(eventName, args);
86+
return this.injector && this.injector.emit(eventName, ...args);
8787
}
8888
}

packages/common/src/server/components/LogIncomingRequestMiddleware.ts

+1
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ export class LogIncomingRequestMiddleware implements IMiddleware {
7272
});
7373
}
7474
}
75+
7576
request.ctx.logger.flush();
7677
}
7778

packages/common/src/server/utils/contextMiddleware.ts

+10-11
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,16 @@ export class ContextMiddleware {
2121
this.reqIdBuilder = reqIdBuilder;
2222
}
2323

24+
static async onClose(err: any, response: any) {
25+
const {req: request} = response;
26+
27+
await request.ctx.emit("$onResponse", request, response);
28+
await request.ctx.destroy();
29+
30+
delete request.ctx;
31+
delete request.log;
32+
}
33+
2434
async use(request: any, response: any, next: any) {
2535
const {level, ignoreUrlPatterns, maxStackSize} = this;
2636

@@ -45,17 +55,6 @@ export class ContextMiddleware {
4555

4656
next();
4757
}
48-
49-
static async onClose(err: any, response: any) {
50-
const {req: request} = response;
51-
try {
52-
await request.ctx.emit("$onResponse", request, response);
53-
await request.ctx.destroy();
54-
} catch (er) {}
55-
56-
delete request.ctx;
57-
delete request.log;
58-
}
5958
}
6059

6160
/**

tasks/gulp/clean.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ module.exports = {
1919
.src([
2020
"test/**/*.{js,js.map,d.ts}",
2121
"test/**/*.{js,js.map,d.ts}",
22-
"packages/**/*.{js,js.map,d.ts,d.ts.map}",
22+
"packages/**/src/**/*.{js,js.map,d.ts,d.ts.map}",
2323
"packages/**/node_modules"
2424
], {read: false})
2525
.pipe(clean());

0 commit comments

Comments
 (0)