diff --git a/gen/secrets.baseline.json b/gen/secrets.baseline.json index c49eea9996..c7a6c09cf6 100644 --- a/gen/secrets.baseline.json +++ b/gen/secrets.baseline.json @@ -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", @@ -199,5 +244,5 @@ } ] }, - "generated_at": "2024-02-20T21:06:04Z" + "generated_at": "2024-03-01T02:26:18Z" } diff --git a/lib/cache/build/Cargo.toml b/lib/cache/build/Cargo.toml index c276086481..2838d47768 100644 --- a/lib/cache/build/Cargo.toml +++ b/lib/cache/build/Cargo.toml @@ -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", diff --git a/lib/cache/build/src/rate_limit.rs b/lib/cache/build/src/rate_limit.rs index 98a6c3f02b..25878f69a2 100644 --- a/lib/cache/build/src/rate_limit.rs +++ b/lib/cache/build/src/rate_limit.rs @@ -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 { diff --git a/lib/chirp/client/src/client.rs b/lib/chirp/client/src/client.rs index f394f35463..982eada602 100644 --- a/lib/chirp/client/src/client.rs +++ b/lib/chirp/client/src/client.rs @@ -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 { @@ -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(); diff --git a/lib/chirp/perf/Cargo.toml b/lib/chirp/perf/Cargo.toml index f63fa7be53..b1ca60828f 100644 --- a/lib/chirp/perf/Cargo.toml +++ b/lib/chirp/perf/Cargo.toml @@ -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", diff --git a/lib/chirp/worker/Cargo.toml b/lib/chirp/worker/Cargo.toml index 69fc3c6f9d..fa6d577066 100644 --- a/lib/chirp/worker/Cargo.toml +++ b/lib/chirp/worker/Cargo.toml @@ -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", diff --git a/lib/pools/Cargo.toml b/lib/pools/Cargo.toml index 8057036906..e7c4fba8f3 100644 --- a/lib/pools/Cargo.toml +++ b/lib/pools/Cargo.toml @@ -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", diff --git a/lib/redis-util/Cargo.toml b/lib/redis-util/Cargo.toml index 1cd3f5fcf8..0b377b2f94 100644 --- a/lib/redis-util/Cargo.toml +++ b/lib/redis-util/Cargo.toml @@ -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 diff --git a/svc/Cargo.lock b/svc/Cargo.lock index ce118adc6a..c0e3f22a36 100644 --- a/svc/Cargo.lock +++ b/svc/Cargo.lock @@ -877,46 +877,6 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" -[[package]] -name = "async-channel" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" -dependencies = [ - "concurrent-queue", - "event-listener", - "futures-core", -] - -[[package]] -name = "async-io" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" -dependencies = [ - "async-lock", - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-lite", - "log", - "parking", - "polling", - "rustix 0.37.27", - "slab", - "socket2 0.4.10", - "waker-fn", -] - -[[package]] -name = "async-lock" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" -dependencies = [ - "event-listener", -] - [[package]] name = "async-nats" version = "0.33.0" @@ -2343,15 +2303,6 @@ dependencies = [ "tokio-util 0.7.10", ] -[[package]] -name = "concurrent-queue" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "console-api" version = "0.5.0" @@ -3229,21 +3180,6 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" -[[package]] -name = "futures-lite" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "fastrand 1.9.0", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - [[package]] name = "futures-macro" version = "0.3.30" @@ -3267,18 +3203,6 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" -[[package]] -name = "futures-time" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6404853a6824881fe5f7d662d147dc4e84ecd2259ba0378f272a71dab600758a" -dependencies = [ - "async-channel", - "async-io", - "futures-core", - "pin-project-lite", -] - [[package]] name = "futures-timer" version = "3.0.2" @@ -4271,17 +4195,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "ip-info" version = "0.0.1" @@ -4652,12 +4565,6 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - [[package]] name = "linux-raw-sys" version = "0.4.13" @@ -5797,12 +5704,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" -[[package]] -name = "parking" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" - [[package]] name = "parking_lot" version = "0.12.1" @@ -5986,22 +5887,6 @@ version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" -[[package]] -name = "polling" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "concurrent-queue", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.48.0", -] - [[package]] name = "portable-atomic" version = "1.6.0" @@ -6288,15 +6173,14 @@ dependencies = [ [[package]] name = "redis" -version = "0.24.0" -source = "git+https://github.com/redis-rs/redis-rs.git?rev=26c977c#26c977c517c2c8ea4668a8e99eb71b67ae75d13f" +version = "0.23.3" +source = "git+https://github.com/rivet-gg/redis-rs.git?rev=ac3e27fa1d133847db54354493f4d25957ad3466#ac3e27fa1d133847db54354493f4d25957ad3466" dependencies = [ "arc-swap", "async-trait", "bytes", "combine", "futures", - "futures-time", "futures-util", "itoa 1.0.10", "native-tls", @@ -7096,20 +6980,6 @@ dependencies = [ "semver", ] -[[package]] -name = "rustix" -version = "0.37.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - [[package]] name = "rustix" version = "0.38.31" @@ -7119,7 +6989,7 @@ dependencies = [ "bitflags 2.4.2", "errno", "libc", - "linux-raw-sys 0.4.13", + "linux-raw-sys", "windows-sys 0.52.0", ] @@ -8178,7 +8048,7 @@ checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" dependencies = [ "cfg-if", "fastrand 2.0.1", - "rustix 0.38.31", + "rustix", "windows-sys 0.52.0", ] @@ -9416,12 +9286,6 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -[[package]] -name = "waker-fn" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" - [[package]] name = "want" version = "0.3.1" @@ -9570,7 +9434,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.31", + "rustix", ] [[package]]