Skip to content

Commit 4ed5d73

Browse files
author
hirsch88
committed
Merge branch 'feature/v3' of github.com:w3tecch/express-typescript-boilerplate into feature/v3
2 parents f73814b + 9358315 commit 4ed5d73

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

src/api/middlewares/ErrorHandlerMiddleware.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
import * as express from 'express';
22
import { Middleware, ExpressErrorMiddlewareInterface, HttpError } from 'routing-controllers';
33
import { env } from '../../core/env';
4-
import { Logger } from '../../core/Logger';
4+
import { Logger, LoggerInterface } from '../../decorators/Logger';
55

66

77
@Middleware({ type: 'after' })
88
export class ErrorHandlerMiddleware implements ExpressErrorMiddlewareInterface {
99

10-
public log = new Logger(__filename);
1110
public isProduction = env.isProduction;
1211

12+
constructor(
13+
@Logger(__filename) private log: LoggerInterface
14+
) { }
15+
1316
public error(error: HttpError, req: express.Request, res: express.Response, next: express.NextFunction): void {
1417
res.status(error.httpCode || 500);
1518

test/unit/middlewares/ErrorHandlerMiddleware.test.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ import { LogMock } from '../lib/LogMock';
77
describe('ErrorHandlerMiddleware', () => {
88

99
test('Should not print stack out in production', () => {
10-
const middleware = new ErrorHandlerMiddleware();
11-
middleware.log = new LogMock();
10+
const middleware = new ErrorHandlerMiddleware(new LogMock());
1211
middleware.isProduction = true;
1312

1413
const res = new MockExpressResponse();
@@ -21,8 +20,7 @@ describe('ErrorHandlerMiddleware', () => {
2120
});
2221

2322
test('Should print stack out in production', () => {
24-
const middleware = new ErrorHandlerMiddleware();
25-
middleware.log = new LogMock();
23+
const middleware = new ErrorHandlerMiddleware(new LogMock());
2624
middleware.isProduction = false;
2725

2826
const res = new MockExpressResponse();

0 commit comments

Comments
 (0)