Update deadpool-redis dependency.

This deprecates the deadpool-redis-cluster crate in favor of the
deadpool-redis crate with cluster feature.
This commit is contained in:
Orne Brocaar 2023-12-18 10:04:05 +00:00
parent fcd0ef2ca5
commit f45d12519c
4 changed files with 13 additions and 39 deletions

37
Cargo.lock generated
View File

@ -802,7 +802,6 @@ dependencies = [
"chrono",
"clap",
"deadpool-redis",
"deadpool-redis-cluster",
"diesel",
"diesel-async",
"diesel_migrations",
@ -1203,25 +1202,14 @@ dependencies = [
[[package]]
name = "deadpool-redis"
version = "0.13.0"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "84930e585871d35b8e06d3e03d03e3a8a4c5dc71afa4376c7cd5f9223e1da1ea"
checksum = "36f2381b0e993d06a1f6d49f486b33bc4004085bf980340fc05726bacc681fff"
dependencies = [
"deadpool",
"redis",
]
[[package]]
name = "deadpool-redis-cluster"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "857c968579c82072dff24f48969d24fb1daab4970d94bb740d87ebb13bc8c2c4"
dependencies = [
"deadpool",
"redis",
"redis_cluster_async",
]
[[package]]
name = "deadpool-runtime"
version = "0.1.3"
@ -3397,9 +3385,9 @@ dependencies = [
[[package]]
name = "redis"
version = "0.23.3"
version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4f49cdc0bb3f412bf8e7d1bd90fe1d9eb10bc5c399ba90973c14662a27b3f8ba"
checksum = "c580d9cbbe1d1b479e8d67cf9daf6a62c957e6846048408b80b43ac3f6af84cd"
dependencies = [
"async-trait",
"bytes",
@ -3414,6 +3402,8 @@ dependencies = [
"rand",
"rustls",
"rustls-native-certs",
"rustls-pemfile",
"rustls-webpki",
"ryu",
"sha1_smol",
"socket2 0.4.10",
@ -3423,21 +3413,6 @@ dependencies = [
"url",
]
[[package]]
name = "redis_cluster_async"
version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "093073cc58cbe376f3308c530edcda1a49ef980de1c32f3fa63622fc5c6f0fb9"
dependencies = [
"crc16",
"futures",
"log",
"pin-project-lite",
"rand",
"redis",
"tokio",
]
[[package]]
name = "redox_syscall"
version = "0.4.1"

View File

@ -9,8 +9,8 @@
repository = "https://github.com/chirpstack/chirpstack"
[dependencies]
chirpstack_api = { path = "../api/rust", version = "4.6.0-test.1" }
redis = { version = "0.23", features = [
chirpstack_api = { path = "../api/rust", version = "4.6.0" }
redis = { version = "0.24", features = [
"cluster-async",
"tokio-rustls-comp",
] }

View File

@ -37,9 +37,8 @@ diesel-async = { version = "0.4", features = ["deadpool", "postgres", "async-con
tokio-postgres = "0.7"
tokio-postgres-rustls = "0.10.0"
bigdecimal = "0.4"
redis = { version = "0.23", features = ["cluster", "tls-rustls", "tokio-rustls-comp"] }
deadpool-redis = "0.13"
deadpool-redis-cluster = "0.1"
redis = { version = "0.24", features = [ "tls-rustls", "tokio-rustls-comp"] }
deadpool-redis = { version = "0.14", features = ["cluster"] }
# Logging
tracing = "0.1"

View File

@ -56,12 +56,12 @@ pub const MIGRATIONS: EmbeddedMigrations = embed_migrations!("./migrations");
#[derive(Clone)]
pub enum AsyncRedisPool {
Client(deadpool_redis::Pool),
ClusterClient(deadpool_redis_cluster::Pool),
ClusterClient(deadpool_redis::cluster::Pool),
}
pub enum AsyncRedisPoolConnection {
Client(deadpool_redis::Connection),
ClusterClient(deadpool_redis_cluster::Connection),
ClusterClient(deadpool_redis::cluster::Connection),
}
impl ConnectionLike for AsyncRedisPoolConnection {
@ -112,7 +112,7 @@ pub async fn setup() -> Result<()> {
info!("Setting up Redis client");
if conf.redis.cluster {
let pool = deadpool_redis_cluster::Config::from_urls(conf.redis.servers.clone())
let pool = deadpool_redis::cluster::Config::from_urls(conf.redis.servers.clone())
.builder()?
.max_size(conf.redis.max_open_connections as usize)
.build()?;