From a642b86ae5cac67ece6df7367a4619c83cb997b0 Mon Sep 17 00:00:00 2001
From: Wez Furlong <wez@wezfurlong.org>
Date: Fri, 3 Mar 2023 07:30:24 -0700
Subject: [PATCH] fix embarrasing bug with calculating exp backoff

The issue was masked by the tests using 2 as the base retry
interval. With realistic numbers we'd pick a crazy large value
for the first retry and immediately consider the message
for expiration.
---
 crates/kumod/src/queue.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/kumod/src/queue.rs b/crates/kumod/src/queue.rs
index 22a00936..c8861813 100644
--- a/crates/kumod/src/queue.rs
+++ b/crates/kumod/src/queue.rs
@@ -89,7 +89,7 @@ impl QueueConfig {
     }
 
     pub fn delay_for_attempt(&self, attempt: u16) -> chrono::Duration {
-        let delay = self.retry_interval.saturating_pow(1 + attempt as u32);
+        let delay = self.retry_interval * 2usize.saturating_pow(attempt as u32);
 
         let delay = match self.max_retry_interval {
             None => delay,
@@ -319,7 +319,8 @@ impl Queue {
             let now = Utc::now();
             let max_age = self.queue_config.get_max_age();
             let age = msg.age(now);
-            if delay + age > max_age {
+            let delayed_age = age + delay;
+            if delayed_age > max_age {
                 tracing::debug!("expiring {id} {age} > {max_age}");
                 log_disposition(
                     RecordType::Expiration,
@@ -333,7 +334,7 @@ impl Queue {
                             subject: 4,
                             detail: 7,
                         }),
-                        content: format!("Delivery time {age} > {max_age}"),
+                        content: format!("Next delivery time {delayed_age} > {max_age}"),
                         command: None,
                     },
                     self.queue_config.egress_pool.as_deref(),
@@ -343,7 +344,6 @@ impl Queue {
                 SpoolManager::remove_from_spool(id).await?;
                 return Ok(());
             }
-            tracing::error!("delaying by {delay:?}");
             msg.delay_by(delay).await?;
         } else if let Some(delay) = delay {
             msg.delay_by(delay).await?;