From d966ad89e53b438483d5606d68e1c8d26504c2f0 Mon Sep 17 00:00:00 2001 From: Piotr Zaczkowski Date: Thu, 25 Jul 2024 12:56:55 +0200 Subject: [PATCH] Fix empty and different level naming --- reqwest-retry/src/middleware.rs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/reqwest-retry/src/middleware.rs b/reqwest-retry/src/middleware.rs index 696a5d8..a63764e 100644 --- a/reqwest-retry/src/middleware.rs +++ b/reqwest-retry/src/middleware.rs @@ -22,6 +22,7 @@ use ::log as LogTracing; #[doc(hidden)] // We need this macro because tracing expects the level to be const: // https://github.com/tokio-rs/tracing/issues/2730 +#[cfg(feature = "tracing")] macro_rules! log_retry { ($level:expr, $($args:tt)*) => {{ match $level { @@ -34,6 +35,13 @@ macro_rules! log_retry { }}; } +#[cfg(all(feature = "log", not(feature = "tracing")))] +macro_rules! log_retry { + ($level:expr, $($args:tt)*) => {{ + LogTracing::log!($level, $($args)*) + }}; +} + /// `RetryTransientMiddleware` offers retry logic for requests that fail in a transient manner /// and can be safely executed again. /// @@ -108,7 +116,10 @@ where Self { retry_policy, retryable_strategy, + #[cfg(feature = "tracing")] retry_log_level: LogLevel::WARN, + #[cfg(all(feature = "log", not(feature = "tracing")))] + retry_log_level: LogLevel::Warn, } } } @@ -175,6 +186,7 @@ where .duration_since(SystemTime::now()) .unwrap_or_else(|_| Duration::default()); // Sleep the requested amount before we try again. + #[cfg(any(feature = "log", feature = "tracing"))] log_retry!( self.retry_log_level, "Retry attempt #{}. Sleeping {:?} before the next attempt",