From 68e525ab9d26380039eeaa1b1b2644a558e90e12 Mon Sep 17 00:00:00 2001 From: JKorf Date: Tue, 20 Feb 2024 22:06:17 +0100 Subject: [PATCH] Logging --- CryptoExchange.Net/Clients/BaseApiClient.cs | 2 -- CryptoExchange.Net/Clients/RestApiClient.cs | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/CryptoExchange.Net/Clients/BaseApiClient.cs b/CryptoExchange.Net/Clients/BaseApiClient.cs index eb03c3d..2b0846e 100644 --- a/CryptoExchange.Net/Clients/BaseApiClient.cs +++ b/CryptoExchange.Net/Clients/BaseApiClient.cs @@ -249,7 +249,6 @@ namespace CryptoExchange.Net if (OutputOriginalData == true) { data = await reader.ReadToEndAsync().ConfigureAwait(false); - _logger.Log(LogLevel.Debug, $"{(requestId != null ? $"[{requestId}] " : "")}Response received{(elapsedMilliseconds != null ? $" in {elapsedMilliseconds}" : " ")}ms: " + data); var result = Deserialize(data, serializer, requestId); result.OriginalData = data; return result; @@ -258,7 +257,6 @@ namespace CryptoExchange.Net // If we don't have to keep track of the original json data we can use the JsonTextReader to deserialize the stream directly // into the desired object, which has increased performance over first reading the string value into memory and deserializing from that using var jsonReader = new JsonTextReader(reader); - _logger.Log(LogLevel.Debug, $"{(requestId != null ? $"[{requestId}] " : "")}Response received{(elapsedMilliseconds != null ? $" in {elapsedMilliseconds}" : " ")}ms"); return new CallResult(serializer.Deserialize(jsonReader)!); } catch (JsonReaderException jre) diff --git a/CryptoExchange.Net/Clients/RestApiClient.cs b/CryptoExchange.Net/Clients/RestApiClient.cs index f8088a5..bf80113 100644 --- a/CryptoExchange.Net/Clients/RestApiClient.cs +++ b/CryptoExchange.Net/Clients/RestApiClient.cs @@ -116,9 +116,9 @@ namespace CryptoExchange.Net var result = await GetResponseAsync(request.Data, deserializer, cancellationToken, true).ConfigureAwait(false); if (!result) - _logger.Log(LogLevel.Warning, $"[Req {result.RequestId}] Error received in {result.ResponseTime!.Value.TotalMilliseconds}ms: {result.Error}"); + _logger.Log(LogLevel.Warning, $"[Req {result.RequestId}] {result.ResponseStatusCode} Error received in {result.ResponseTime!.Value.TotalMilliseconds}ms: {result.Error}"); else - _logger.Log(LogLevel.Debug, $"[Req {result.RequestId}] Response received in {result.ResponseTime!.Value.TotalMilliseconds}ms{(OutputOriginalData ? (": " + result.OriginalData) : "")}"); + _logger.Log(LogLevel.Debug, $"[Req {result.RequestId}] {result.ResponseStatusCode} Response received in {result.ResponseTime!.Value.TotalMilliseconds}ms{(OutputOriginalData ? (": " + result.OriginalData) : "")}"); if (await ShouldRetryRequestAsync(result, currentTry).ConfigureAwait(false)) continue; @@ -170,9 +170,9 @@ namespace CryptoExchange.Net var result = await GetResponseAsync(request.Data, deserializer, cancellationToken, false).ConfigureAwait(false); if (!result) - _logger.Log(LogLevel.Warning, $"[Req {result.RequestId}] Error received in {result.ResponseTime!.Value.TotalMilliseconds}ms: {result.Error}"); + _logger.Log(LogLevel.Warning, $"[Req {result.RequestId}] {result.ResponseStatusCode} Error received in {result.ResponseTime!.Value.TotalMilliseconds}ms: {result.Error}"); else - _logger.Log(LogLevel.Debug, $"[Req {result.RequestId}] Response received in {result.ResponseTime!.Value.TotalMilliseconds}ms{(OutputOriginalData ? (": " + result.OriginalData) : "")}"); + _logger.Log(LogLevel.Debug, $"[Req {result.RequestId}] {result.ResponseStatusCode} Response received in {result.ResponseTime!.Value.TotalMilliseconds}ms{(OutputOriginalData ? (": " + result.OriginalData) : "")}"); if (await ShouldRetryRequestAsync(result, currentTry).ConfigureAwait(false)) continue;