From cd8441d87f4ec73ee4e31a24c2f6399e4704f50a Mon Sep 17 00:00:00 2001 From: Oliver Joseph Ash Date: Thu, 28 Feb 2019 16:38:40 +0000 Subject: [PATCH 1/5] pino-http: add `customLogLevel` option --- types/pino-http/index.d.ts | 1 + types/pino-http/pino-http-tests.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/types/pino-http/index.d.ts b/types/pino-http/index.d.ts index 54ac4e9149..f29dfaadd6 100644 --- a/types/pino-http/index.d.ts +++ b/types/pino-http/index.d.ts @@ -20,6 +20,7 @@ declare namespace PinoHttp { genReqId?: GenReqId; useLevel?: Level; stream?: DestinationStream; + customLogLevel?: (res: unknown, error: unknown) => Level } interface GenReqId { diff --git a/types/pino-http/pino-http-tests.ts b/types/pino-http/pino-http-tests.ts index 8a86bf08e8..105f26b638 100644 --- a/types/pino-http/pino-http-tests.ts +++ b/types/pino-http/pino-http-tests.ts @@ -18,3 +18,4 @@ pinoHttp({ genReqId: (req) => Buffer.allocUnsafe(16) }); pinoHttp({ useLevel: 'error' }); pinoHttp({ prettyPrint: true }); pinoHttp(new Writable()); +pinoHttp({ customLogLevel(req, res) { return 'info' } }); From 140b7f67f2d878c8b5a91435dc97bcefeabf2f10 Mon Sep 17 00:00:00 2001 From: Oliver Joseph Ash Date: Thu, 28 Feb 2019 16:51:04 +0000 Subject: [PATCH 2/5] Use `ServerResponse` --- types/pino-http/index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/pino-http/index.d.ts b/types/pino-http/index.d.ts index f29dfaadd6..d78edbbabe 100644 --- a/types/pino-http/index.d.ts +++ b/types/pino-http/index.d.ts @@ -20,7 +20,7 @@ declare namespace PinoHttp { genReqId?: GenReqId; useLevel?: Level; stream?: DestinationStream; - customLogLevel?: (res: unknown, error: unknown) => Level + customLogLevel?: (res: ServerResponse, error: unknown) => Level } interface GenReqId { From b79ddcfc2e37d1d0734e894f25e1c348805461be Mon Sep 17 00:00:00 2001 From: Oliver Joseph Ash Date: Thu, 28 Feb 2019 19:46:02 +0000 Subject: [PATCH 3/5] Avoid `unknown` --- types/pino-http/index.d.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/types/pino-http/index.d.ts b/types/pino-http/index.d.ts index d78edbbabe..b47c95a2b9 100644 --- a/types/pino-http/index.d.ts +++ b/types/pino-http/index.d.ts @@ -15,12 +15,15 @@ declare function PinoHttp(stream?: DestinationStream): PinoHttp.HttpLogger; declare namespace PinoHttp { type HttpLogger = (req: IncomingMessage, res: ServerResponse) => void; + // When we upgrade to TypeScript 3.0, we can use `unknown`. + type PoorMansUnknown = {} | null | undefined; + interface Options extends LoggerOptions { logger?: Logger; genReqId?: GenReqId; useLevel?: Level; stream?: DestinationStream; - customLogLevel?: (res: ServerResponse, error: unknown) => Level + customLogLevel?: (res: ServerResponse, error: PoorMansUnknown) => Level } interface GenReqId { From b3ef40769790614df7ac9b638b3d81d315031563 Mon Sep 17 00:00:00 2001 From: Oliver Joseph Ash Date: Thu, 28 Feb 2019 20:24:52 +0000 Subject: [PATCH 4/5] Format --- types/pino-http/index.d.ts | 2 +- types/pino-http/pino-http-tests.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/types/pino-http/index.d.ts b/types/pino-http/index.d.ts index b47c95a2b9..33e7e4dedd 100644 --- a/types/pino-http/index.d.ts +++ b/types/pino-http/index.d.ts @@ -23,7 +23,7 @@ declare namespace PinoHttp { genReqId?: GenReqId; useLevel?: Level; stream?: DestinationStream; - customLogLevel?: (res: ServerResponse, error: PoorMansUnknown) => Level + customLogLevel?: (res: ServerResponse, error: PoorMansUnknown) => Level; } interface GenReqId { diff --git a/types/pino-http/pino-http-tests.ts b/types/pino-http/pino-http-tests.ts index 105f26b638..013e23ae10 100644 --- a/types/pino-http/pino-http-tests.ts +++ b/types/pino-http/pino-http-tests.ts @@ -18,4 +18,4 @@ pinoHttp({ genReqId: (req) => Buffer.allocUnsafe(16) }); pinoHttp({ useLevel: 'error' }); pinoHttp({ prettyPrint: true }); pinoHttp(new Writable()); -pinoHttp({ customLogLevel(req, res) { return 'info' } }); +pinoHttp({ customLogLevel(req, res) { return 'info'; } }); From bafe37d461f65d39f28405a1c9ff8ecd8517a4c0 Mon Sep 17 00:00:00 2001 From: Oliver Joseph Ash Date: Fri, 1 Mar 2019 09:10:18 +0000 Subject: [PATCH 5/5] Use `Error` type as per stream docs --- types/pino-http/index.d.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/types/pino-http/index.d.ts b/types/pino-http/index.d.ts index 33e7e4dedd..86fae78a3e 100644 --- a/types/pino-http/index.d.ts +++ b/types/pino-http/index.d.ts @@ -15,15 +15,12 @@ declare function PinoHttp(stream?: DestinationStream): PinoHttp.HttpLogger; declare namespace PinoHttp { type HttpLogger = (req: IncomingMessage, res: ServerResponse) => void; - // When we upgrade to TypeScript 3.0, we can use `unknown`. - type PoorMansUnknown = {} | null | undefined; - interface Options extends LoggerOptions { logger?: Logger; genReqId?: GenReqId; useLevel?: Level; stream?: DestinationStream; - customLogLevel?: (res: ServerResponse, error: PoorMansUnknown) => Level; + customLogLevel?: (res: ServerResponse, error: Error) => Level; } interface GenReqId {