rondomoon/rondo-framework
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Generate req.correlationId

Browse Source
This commit is contained in:
Jerko Steiner 2019-03-19 10:20:32 +05:00
parent c813407c95
commit 6ae5817529
5 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/server/@types/express.d.ts vendored
View File

@ -9,6 +9,7 @@ declare namespace Application {
declare namespace Express {
export interface Request {
correlationId: string
user?: Application.User
logInPromise(user: any): Promise<void>
}

3
packages/server/src/middleware/ErrorApiHandler.ts
View File

@ -6,7 +6,8 @@ export class ErrorApiHandler implements IMiddleware {
constructor(readonly logger: ILogger) {}
handle: IErrorHandler = (err, req, res, next) => {
this.logger.error('An API error occurred: %s', err.stack)
this.logger.error('%s An API error occurred: %s',
req.correlationId, err.stack)
const statusCode = this.getStatus(err)
res.status(statusCode)
res.end('An error occurred')

4
packages/server/src/middleware/ErrorPageHandler.ts
View File

@ -6,7 +6,9 @@ export class ErrorPageHandler implements IMiddleware {
constructor(readonly logger: ILogger) {}
handle: IErrorHandler = (err, req, res, next) => {
this.logger.error('An error occurred: %s', err.stack)
this.logger.error(
'%s An error occurred: %s',
req.correlationId, err.stack)
// TODO Show an error page!
const statusCode = this.getStatus(err)
res.status(statusCode)

10
packages/server/src/middleware/RequestLogger.ts
View File

@ -1,21 +1,23 @@
import {IHandler} from './IHandler'
import {ILogger} from '../logger/ILogger'
import {IMiddleware} from './IMiddleware'
import shortid from 'shortid'
export class RequestLogger implements IMiddleware {
constructor(protected readonly logger: ILogger) {}
handle: IHandler = (req, res, next) => {
const start = Date.now()
req.correlationId = shortid.generate()
res.on('finish', () => {
const { method, originalUrl, user } = req
const username = user ? user.username : ''
const duration = Date.now() - start
this.logger.debug('%s %s [%s] %j',
method, originalUrl, username, req.body)
this.logger.debug('%s %s %s [%s] %j',
req.correlationId, method, originalUrl, username, req.body)
const { statusCode } = res
this.logger.info('%s %s [%s] %d %sms',
method, originalUrl, username, statusCode, duration)
this.logger.info('%s %s %s [%s] %d %sms',
req.correlationId, method, originalUrl, username, statusCode, duration)
})
next()
}

3
packages/server/src/middleware/Transaction.ts
View File

@ -14,7 +14,8 @@ export class Transaction implements IMiddleware {
ns.bindEmitter(res)
ns.run(() => {
const correlationId = shortid.generate();
// use pregenerated request correlationId
const correlationId = req.correlationId || shortid.generate();
(req as any).correlationId = correlationId
ns.set(CORRELATION_ID, correlationId)
next()