From a33f80c4977abe6fea0caf018610878bb5c62dd8 Mon Sep 17 00:00:00 2001 From: Abel Luck Date: Tue, 6 Jun 2023 09:03:10 +0000 Subject: [PATCH] metamigo-common: fix pretty deprecation error in pino logging --- packages/metamigo-common/package.json | 1 + packages/metamigo-common/src/hapi.ts | 4 ++-- packages/metamigo-common/src/logger.ts | 11 +++-------- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/packages/metamigo-common/package.json b/packages/metamigo-common/package.json index 387af45..1e5061f 100644 --- a/packages/metamigo-common/package.json +++ b/packages/metamigo-common/package.json @@ -56,6 +56,7 @@ "next-auth": "^4.22.1", "pg-promise": "^11.4.3", "pino": "^8.14.1", + "pino-pretty": "^10.0.0", "prom-client": "^14.x.x", "uuid": "^9.0.0" } diff --git a/packages/metamigo-common/src/hapi.ts b/packages/metamigo-common/src/hapi.ts index 7e6d5df..45c06cf 100644 --- a/packages/metamigo-common/src/hapi.ts +++ b/packages/metamigo-common/src/hapi.ts @@ -8,7 +8,7 @@ import PinoPlugin from "hapi-pino"; import { createServer as createPrometheusServer } from "@promster/server"; import { createHttpTerminator } from "http-terminator"; -import { getPrettyPrint } from "./logger.js"; +import { configureLogger } from "./logger.js"; import RequestIdPlugin from "./plugins/request-id.js"; import StatusPlugin from "./plugins/status.js"; import ConfigPlugin from "./plugins/config.js"; @@ -79,8 +79,8 @@ export const defaultPlugins = ( { plugin: PinoPlugin, options: { - prettyPrint: getPrettyPrint(config), level, + instance: configureLogger(config), logRequestStart, logRequestComplete, logPayload: logRequestPayload, diff --git a/packages/metamigo-common/src/logger.ts b/packages/metamigo-common/src/logger.ts index 60e7b55..9209806 100644 --- a/packages/metamigo-common/src/logger.ts +++ b/packages/metamigo-common/src/logger.ts @@ -1,20 +1,15 @@ import pino, { LoggerOptions } from "pino"; import { IMetamigoConfig } from "./config/index.js"; -export const getPrettyPrint = ( - config: T -): boolean => { - const { prettyPrint } = config.logging; - if (prettyPrint === "auto") return config?.isDev || false; - return prettyPrint === true; -}; - export const configureLogger = ( config: T ): pino.Logger => { const { level, redact } = config.logging; const options: LoggerOptions = { level, + transport: { + target: "pino-pretty", + }, redact: { paths: redact, remove: true,