update governor

conorbros · Jul 28, 2023 · 9eac5d8 · 9eac5d8
1 parent 468cea8
commit 9eac5d8
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 37 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/shotover/Cargo.toml b/shotover/Cargo.toml
@@ -21,7 +21,7 @@ bytes-utils = "0.1.1"
 derivative = "2.1.1"
 cached = "0.44"
 async-recursion = "1.0"
-governor = { version = "0.5.0", default-features = false, features = ["std", "jitter", "quanta"] }
+governor = { version = "0.6", default-features = false, features = ["std", "jitter", "quanta"] }
 nonzero_ext = "0.3.0"
 version-compare = "0.1"
 rand = { features = ["small_rng"], workspace = true }

diff --git a/shotover/src/transforms/throttling.rs b/shotover/src/transforms/throttling.rs
@@ -67,15 +67,20 @@ impl Transform for RequestThrottling {
  let throttled_messages: Vec<(Message, usize)> = (0..requests_wrapper.requests.len())
  .rev()
  .filter_map(|i| {
- if self
+ match self
  .limiter
  .check_n(requests_wrapper.requests[i].cell_count().ok()?)
- .is_err()
  {
- let message = requests_wrapper.requests.remove(i);
- Some((message, i))
- } else {
- None
+ Ok(Ok(())) => None,
+ Ok(Err(_)) => {
+ let message = requests_wrapper.requests.remove(i);
+ Some((message, i))
+ }
+ Err(e) => {
+ tracing::info!("{e}");
+ let message = requests_wrapper.requests.remove(i);
+ Some((message, i))
+ }
  }
  })
  .collect();