fixup! Update redis health check

svix · May 3, 2024 · 178af73 · 178af73
1 parent bf0301c
commit 178af73
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 12 deletions.
diff --git a/server/Cargo.lock b/server/Cargo.lock
diff --git a/server/svix-server/Cargo.toml b/server/svix-server/Cargo.toml
@@ -72,7 +72,7 @@ urlencoding = "2.1.2"
 form_urlencoded = "1.1.0"
 lapin = "2.1.1"
 sentry = { version = "0.32.2", features = ["tracing"] }
-omniqueue = { git = "https://github.com/svix/omniqueue-rs/", rev = "54f7c30139366ed90768e495d8520cf6639f5325", default-features = false, features = ["in_memory", "rabbitmq-with-message-ids", "redis_cluster"] }
+omniqueue = { git = "https://github.com/svix/omniqueue-rs", rev = "5ae22000e2ea214ba707cac81657f098e5785a76", default-features = false, features = ["in_memory", "rabbitmq-with-message-ids", "redis_cluster"] }
 
 [target.'cfg(not(target_env = "msvc"))'.dependencies]
 tikv-jemallocator = { version = "0.5", optional = true }

diff --git a/server/svix-server/src/queue/redis.rs b/server/svix-server/src/queue/redis.rs
@@ -29,8 +29,7 @@
 
 use std::{num::NonZeroUsize, sync::Arc, time::Duration};
 
-use bb8_redis::RedisMultiplexedConnectionManager;
-use omniqueue::backends::{redis::RedisClusterConnectionManager, RedisBackend, RedisConfig};
+use omniqueue::backends::{RedisBackend, RedisConfig};
 use redis::{AsyncCommands as _, RedisResult};
 
 use super::{QueueTask, TaskQueueConsumer, TaskQueueProducer};
@@ -214,7 +213,7 @@ async fn new_pair_inner(
     match &cfg.queue_type {
         QueueType::RedisCluster => {
             let (producer, consumer) =
-                RedisBackend::<RedisClusterConnectionManager>::builder(config)
+                RedisBackend::cluster_builder(config)
                     .build_pair()
                     .await
                     .expect("Error initializing redis-cluster queue");
@@ -225,7 +224,7 @@ async fn new_pair_inner(
         }
         _ => {
             let (producer, consumer) =
-                RedisBackend::<RedisMultiplexedConnectionManager>::builder(config)
+                RedisBackend::builder(config)
                     .build_pair()
                     .await
                     .expect("Error initializing redis queue");