Skip to content

Commit

Permalink
fix: revert to redis-rs v0.23.3 with panic patch (#552)
Browse files Browse the repository at this point in the history 
Fixes RVT-3682
  • Loading branch information
@NathanFlurry
NathanFlurry committed Mar 1, 2024
1 parent f5533dc commit 3780eaa
Show file tree
Hide file tree
Showing 9 changed files with 64 additions and 155 deletions.
47 changes: 46 additions & 1 deletion gen/secrets.baseline.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,51 @@
"line_number": 39
}
],
"lib/cache/build/Cargo.toml": [
{
"type": "Hex High Entropy String",
"filename": "lib/cache/build/Cargo.toml",
"hashed_secret": "094ac283ac093cc8b5dfcd1ac2540aca3eb8cecb",
"is_verified": false,
"line_number": 28
}
],
"lib/chirp/perf/Cargo.toml": [
{
"type": "Hex High Entropy String",
"filename": "lib/chirp/perf/Cargo.toml",
"hashed_secret": "094ac283ac093cc8b5dfcd1ac2540aca3eb8cecb",
"is_verified": false,
"line_number": 25
}
],
"lib/chirp/worker/Cargo.toml": [
{
"type": "Hex High Entropy String",
"filename": "lib/chirp/worker/Cargo.toml",
"hashed_secret": "094ac283ac093cc8b5dfcd1ac2540aca3eb8cecb",
"is_verified": false,
"line_number": 51
}
],
"lib/pools/Cargo.toml": [
{
"type": "Hex High Entropy String",
"filename": "lib/pools/Cargo.toml",
"hashed_secret": "094ac283ac093cc8b5dfcd1ac2540aca3eb8cecb",
"is_verified": false,
"line_number": 41
}
],
"lib/redis-util/Cargo.toml": [
{
"type": "Hex High Entropy String",
"filename": "lib/redis-util/Cargo.toml",
"hashed_secret": "094ac283ac093cc8b5dfcd1ac2540aca3eb8cecb",
"is_verified": false,
"line_number": 15
}
],
"lib/util/core/src/faker.rs": [
{
"type": "Base64 High Entropy String",
Expand Down Expand Up @@ -199,5 +244,5 @@
}
]
},
"generated_at": "2024-02-20T21:06:04Z"
"generated_at": "2024-03-01T02:26:18Z"
}
4 changes: 2 additions & 2 deletions lib/cache/build/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ uuid = { version = "1", features = ["v4"] }

[dependencies.redis]
# TODO: https://github.com/rivet-gg/rivet/issues/508
git = "https://github.com/redis-rs/redis-rs.git"
rev = "26c977c"
git = "https://github.com/rivet-gg/redis-rs.git"
rev = "ac3e27fa1d133847db54354493f4d25957ad3466"
default-features = false
features = [
"keep-alive",
Expand Down
2 changes: 1 addition & 1 deletion lib/cache/build/src/rate_limit.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ impl CacheInner {
let mut pipe = redis::pipe();
pipe.atomic();
pipe.incr(&key, 1);
pipe.pexpire(&key, result.ttl_ms()).ignore();
pipe.pexpire(&key, result.ttl_ms() as usize).ignore();

async move {
match pipe.query_async::<_, (i64,)>(&mut conn).await {
Expand Down
4 changes: 2 additions & 2 deletions lib/chirp/client/src/client.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -781,7 +781,7 @@ impl Client {
.ignore();

// Automatically expire
pipe.expire(&tail_key, ttl).ignore();
pipe.expire(&tail_key, ttl as usize).ignore();

// Write history
if M::HISTORY {
Expand All @@ -803,7 +803,7 @@ impl Client {
pipe.zadd(&history_key, message_buf.as_slice(), ts).ignore();

// Automatically expire
pipe.expire(&history_key, ttl).ignore();
pipe.expire(&history_key, ttl as usize).ignore();

let perf = self.perf().clone();
let mut conn = self.redis_chirp_ephemeral.clone();
Expand Down
4 changes: 2 additions & 2 deletions lib/chirp/perf/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ features = ["v4", "serde"]

[dependencies.redis]
# TODO: https://github.com/rivet-gg/rivet/issues/508
git = "https://github.com/redis-rs/redis-rs.git"
rev = "26c977c"
git = "https://github.com/rivet-gg/redis-rs.git"
rev = "ac3e27fa1d133847db54354493f4d25957ad3466"
default-features = false
features = [
"keep-alive",
Expand Down
4 changes: 2 additions & 2 deletions lib/chirp/worker/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ features = ["v4", "serde"]

[dependencies.redis]
# TODO: https://github.com/rivet-gg/rivet/issues/508
git = "https://github.com/redis-rs/redis-rs.git"
rev = "26c977c"
git = "https://github.com/rivet-gg/redis-rs.git"
rev = "ac3e27fa1d133847db54354493f4d25957ad3466"
default-features = false
features = [
"keep-alive",
Expand Down
4 changes: 2 additions & 2 deletions lib/pools/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ features = [

[dependencies.redis]
# TODO: https://github.com/rivet-gg/rivet/issues/508
git = "https://github.com/redis-rs/redis-rs.git"
rev = "26c977c"
git = "https://github.com/rivet-gg/redis-rs.git"
rev = "ac3e27fa1d133847db54354493f4d25957ad3466"
default-features = false
features = [
"keep-alive",
Expand Down
4 changes: 2 additions & 2 deletions lib/redis-util/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ regex = "1.5"

[dependencies.redis]
# TODO: https://github.com/rivet-gg/rivet/issues/508
git = "https://github.com/redis-rs/redis-rs.git"
rev = "26c977c"
git = "https://github.com/rivet-gg/redis-rs.git"
rev = "ac3e27fa1d133847db54354493f4d25957ad3466"
default-features = false

146 changes: 5 additions & 141 deletions svc/Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 3780eaa

Please sign in to comment.