From e81516cc5d0fbe95c9ef70aa6d2f51f759782162 Mon Sep 17 00:00:00 2001 From: Javier Cicchelli Date: Wed, 23 Apr 2025 00:15:04 +0200 Subject: [PATCH] Moved the "metadata(context: request: statusCode: redirect: )" static function to the LoggerMetadata+Functions extension in the library target. --- .../Controllers/ArchiveController.swift | 19 ------------- .../Extensions/LoggerMetadata+Functions.swift | 28 +++++++++++++++++++ .../Internal/Middlewares/DocCMiddleware.swift | 19 ------------- 3 files changed, 28 insertions(+), 38 deletions(-) create mode 100644 Library/Sources/Internal/Extensions/LoggerMetadata+Functions.swift diff --git a/Library/Sources/Internal/Controllers/ArchiveController.swift b/Library/Sources/Internal/Controllers/ArchiveController.swift index bee4191..f2dec07 100644 --- a/Library/Sources/Internal/Controllers/ArchiveController.swift +++ b/Library/Sources/Internal/Controllers/ArchiveController.swift @@ -116,25 +116,6 @@ private extension ArchiveController { } -// MARK: - Logger,Metadata+Functions - -private extension Logger.Metadata { - - // MARK: Functions - - static func metadata( - context: Context, - request: Request, - statusCode: HTTPResponse.Status - ) -> Logger.Metadata {[ - "hb.request.id": "\(context.id)", - "hb.request.method": "\(request.method.rawValue)", - "hb.request.path": "\(request.uri.path)", - "hb.request.status": "\(statusCode.code)" - ]} - -} - // MARK: - RouterPath+Constants private extension RouterPath { diff --git a/Library/Sources/Internal/Extensions/LoggerMetadata+Functions.swift b/Library/Sources/Internal/Extensions/LoggerMetadata+Functions.swift new file mode 100644 index 0000000..f07158a --- /dev/null +++ b/Library/Sources/Internal/Extensions/LoggerMetadata+Functions.swift @@ -0,0 +1,28 @@ +import Hummingbird +import Logging + +extension Logger.Metadata { + + // MARK: Functions + + static func metadata( + context: Context, + request: Request, + statusCode: HTTPResponse.Status, + redirect: String? = nil + ) -> Logger.Metadata { + var metadata: Logger.Metadata = [ + "hb.request.id": "\(context.id)", + "hb.request.method": "\(request.method.rawValue)", + "hb.request.path": "\(request.uri.path)", + "hb.request.status": "\(statusCode.code)" + ] + + if let redirect { + metadata["hb.request.redirect"] = "\(redirect)" + } + + return metadata + } + +} diff --git a/Library/Sources/Internal/Middlewares/DocCMiddleware.swift b/Library/Sources/Internal/Middlewares/DocCMiddleware.swift index 81b35d5..5db9b7b 100644 --- a/Library/Sources/Internal/Middlewares/DocCMiddleware.swift +++ b/Library/Sources/Internal/Middlewares/DocCMiddleware.swift @@ -227,25 +227,6 @@ private extension DocCMiddleware { } -// MARK: - Logger,Metadata+Functions - -private extension Logger.Metadata { - - // MARK: Functions - - static func metadata( - context: Context, - request: Request, - statusCode: HTTPResponse.Status - ) -> Logger.Metadata {[ - "hb.request.id": "\(context.id)", - "hb.request.method": "\(request.method.rawValue)", - "hb.request.path": "\(request.uri.path)", - "hb.request.status": "\(statusCode.code)" - ]} - -} - // MARK: - String+Constants private extension String {