From 63dea0ffeed73b06ee7f11823704172b2541a605 Mon Sep 17 00:00:00 2001 From: NachoSoto Date: Thu, 15 Jun 2023 18:46:29 -0700 Subject: [PATCH] `HTTPClient`: improved log for failed requests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changed this log: ``` [network] DEBUG: ℹ️ API request failed: GET /v1/subscribers/17571811-B0A4-49DC-B326-572E602BF195: Request failed signature verification. ``` To this: ``` [network] DEBUG: ℹ️ API request failed: GET /v1/subscribers/BD9F38FF-33C6-4A77-86F7-6AEA92E6717D (200): Request failed signature verification. ``` This was useful when debugging #2668 and #2659. --- Sources/Logging/Strings/NetworkStrings.swift | 7 ++++--- Sources/Networking/HTTPClient/HTTPClient.swift | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Sources/Logging/Strings/NetworkStrings.swift b/Sources/Logging/Strings/NetworkStrings.swift index 0ef09ef54f..24a52141d2 100644 --- a/Sources/Logging/Strings/NetworkStrings.swift +++ b/Sources/Logging/Strings/NetworkStrings.swift @@ -19,7 +19,7 @@ enum NetworkStrings { case api_request_started(HTTPRequest) case api_request_completed(_ request: HTTPRequest, httpCode: HTTPStatusCode) - case api_request_failed(_ request: HTTPRequest, error: NetworkError) + case api_request_failed(_ request: HTTPRequest, httpCode: HTTPStatusCode?, error: NetworkError) case reusing_existing_request_for_operation(CacheableNetworkOperation.Type, String) case creating_json_error(error: String) case json_data_received(dataString: String) @@ -53,8 +53,9 @@ extension NetworkStrings: LogMessage { case let .api_request_completed(request, httpCode): return "API request completed: \(request.description) (\(httpCode.rawValue))" - case let .api_request_failed(request, error): - return "API request failed: \(request.description): \(error.description)" + case let .api_request_failed(request, statusCode, error): + return "API request failed: \(request.description) (\(statusCode?.rawValue.description ?? "<>")): " + + "\(error.description)" case let .reusing_existing_request_for_operation(operationType, cacheKey): return "Network operation '\(operationType)' found with the same cache key " + diff --git a/Sources/Networking/HTTPClient/HTTPClient.swift b/Sources/Networking/HTTPClient/HTTPClient.swift index 22bf7247bc..9671d47241 100644 --- a/Sources/Networking/HTTPClient/HTTPClient.swift +++ b/Sources/Networking/HTTPClient/HTTPClient.swift @@ -320,7 +320,9 @@ private extension HTTPClient { httpCode: urlResponse?.httpStatusCode ?? response.statusCode )) case let .failure(error): - Logger.debug(Strings.network.api_request_failed(request.httpRequest, error: error)) + Logger.debug(Strings.network.api_request_failed(request.httpRequest, + httpCode: urlResponse?.httpStatusCode, + error: error)) } request.completionHandler?(response)