From a9ff3c0e8e90ada61b4ae2a0369c58968aeeff62 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 06:33:02 +0000 Subject: [PATCH 1/7] Bump redis from 0.23.3 to 0.25.3 in /deepwell Bumps [redis](https://github.com/redis-rs/redis-rs) from 0.23.3 to 0.25.3. - [Release notes](https://github.com/redis-rs/redis-rs/releases) - [Commits](https://github.com/redis-rs/redis-rs/compare/redis-0.23.3...redis-0.25.3) --- updated-dependencies: - dependency-name: redis dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- deepwell/Cargo.lock | 29 +++++++++++++++++++++++++---- deepwell/Cargo.toml | 2 +- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/deepwell/Cargo.lock b/deepwell/Cargo.lock index 44577d5139..e3591db3df 100644 --- a/deepwell/Cargo.lock +++ b/deepwell/Cargo.lock @@ -906,7 +906,7 @@ dependencies = [ "once_cell", "paste", "rand 0.8.5", - "redis", + "redis 0.25.3", "ref-map", "regex", "reqwest 0.12.4", @@ -3071,12 +3071,10 @@ version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4f49cdc0bb3f412bf8e7d1bd90fe1d9eb10bc5c399ba90973c14662a27b3f8ba" dependencies = [ - "arc-swap", "async-std", "async-trait", "bytes", "combine", - "futures", "futures-util", "itoa", "percent-encoding", @@ -3085,6 +3083,29 @@ dependencies = [ "sha1_smol", "socket2 0.4.10", "tokio", + "tokio-util", + "url", +] + +[[package]] +name = "redis" +version = "0.25.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6472825949c09872e8f2c50bde59fcefc17748b6be5c90fd67cd8b4daca73bfd" +dependencies = [ + "arc-swap", + "async-trait", + "bytes", + "combine", + "futures", + "futures-util", + "itoa", + "percent-encoding", + "pin-project-lite", + "ryu", + "sha1_smol", + "socket2 0.5.6", + "tokio", "tokio-retry", "tokio-util", "url", @@ -3314,7 +3335,7 @@ dependencies = [ "lazy_static", "radix_fmt", "rand 0.8.5", - "redis", + "redis 0.23.3", "thiserror", ] diff --git a/deepwell/Cargo.toml b/deepwell/Cargo.toml index f592ce0fe3..9169b67c1e 100644 --- a/deepwell/Cargo.toml +++ b/deepwell/Cargo.toml @@ -42,7 +42,7 @@ notify = { version = "6", optional = true } once_cell = "1" paste = "1" rand = "0.8" -redis = { version = "0.23", features = ["aio", "connection-manager", "keep-alive", "tokio-comp"] } +redis = { version = "0.25", features = ["aio", "connection-manager", "keep-alive", "tokio-comp"] } ref-map = "0.1" regex = "1" reqwest = { version = "0.12", features = ["json", "rustls-tls"], default-features = false } From 7e5bf41242d76c4b19abe055aca3d2d1f14224f9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Apr 2024 06:09:55 +0000 Subject: [PATCH 2/7] Bump rsmq_async from 8.0.2 to 9.0.0 in /deepwell Bumps [rsmq_async](https://github.com/Couragium/rsmq-async-rs) from 8.0.2 to 9.0.0. - [Commits](https://github.com/Couragium/rsmq-async-rs/commits) --- updated-dependencies: - dependency-name: rsmq_async dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- deepwell/Cargo.lock | 525 ++++++++++++++++++++++---------------------- deepwell/Cargo.toml | 2 +- 2 files changed, 260 insertions(+), 267 deletions(-) diff --git a/deepwell/Cargo.lock b/deepwell/Cargo.lock index e3591db3df..40942d23bd 100644 --- a/deepwell/Cargo.lock +++ b/deepwell/Cargo.lock @@ -23,7 +23,7 @@ version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" dependencies = [ - "getrandom 0.2.12", + "getrandom 0.2.14", "once_cell", "version_check", ] @@ -35,7 +35,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", - "getrandom 0.2.12", + "getrandom 0.2.14", "once_cell", "version_check", "zerocopy", @@ -58,9 +58,9 @@ checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "android-tzdata" @@ -133,9 +133,9 @@ checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" [[package]] name = "arc-swap" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b3d0060af21e8d11a926981cc00c6c1541aa91dd64b9f881985c3da1094425f" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "argon2" @@ -177,27 +177,26 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" +checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928" dependencies = [ "concurrent-queue", - "event-listener 5.2.0", - "event-listener-strategy 0.5.0", + "event-listener 5.3.0", + "event-listener-strategy 0.5.2", "futures-core", "pin-project-lite", ] [[package]] name = "async-executor" -version = "1.8.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" +checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a" dependencies = [ - "async-lock 3.3.0", "async-task", "concurrent-queue", - "fastrand 2.0.1", + "fastrand 2.1.0", "futures-lite 2.3.0", "slab", ] @@ -208,7 +207,7 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" dependencies = [ - "async-channel 2.2.0", + "async-channel 2.2.1", "async-executor", "async-io 2.3.2", "async-lock 3.3.0", @@ -249,8 +248,8 @@ dependencies = [ "futures-io", "futures-lite 2.3.0", "parking", - "polling 3.5.0", - "rustix 0.38.32", + "polling 3.7.0", + "rustix 0.38.34", "slab", "tracing", "windows-sys 0.52.0", @@ -321,14 +320,14 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.53", + "syn 2.0.60", ] [[package]] name = "async-task" -version = "4.7.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" @@ -338,7 +337,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.53", + "syn 2.0.60", ] [[package]] @@ -358,9 +357,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "aws-creds" @@ -388,9 +387,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.70" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95d8e92cac0961e91dbd517496b00f7e9b92363dbe6d42c3198268323798860c" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", @@ -512,18 +511,16 @@ dependencies = [ [[package]] name = "blocking" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +checksum = "495f7104e962b7356f0aeb34247aca1fe7d2e783b346582db7f2904cb5717e88" dependencies = [ - "async-channel 2.2.0", + "async-channel 2.2.1", "async-lock 3.3.0", "async-task", - "fastrand 2.0.1", "futures-io", "futures-lite 2.3.0", "piper", - "tracing", ] [[package]] @@ -538,9 +535,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.15.4" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytecheck" @@ -572,18 +569,19 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "cc" -version = "1.0.90" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] @@ -594,15 +592,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.35" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -650,9 +648,9 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "combine" -version = "4.6.6" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" dependencies = [ "bytes", "futures-core", @@ -664,9 +662,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] @@ -730,9 +728,9 @@ dependencies = [ [[package]] name = "crc" -version = "3.0.1" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" dependencies = [ "crc-catalog", ] @@ -826,7 +824,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.53", + "syn 2.0.60", ] [[package]] @@ -854,7 +852,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "lock_api", "once_cell", "parking_lot_core", @@ -906,7 +904,7 @@ dependencies = [ "once_cell", "paste", "rand 0.8.5", - "redis 0.25.3", + "redis", "ref-map", "regex", "reqwest 0.12.4", @@ -937,9 +935,9 @@ dependencies = [ [[package]] name = "der" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" dependencies = [ "const-oid", "pem-rfc7468", @@ -1029,7 +1027,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.53", + "syn 2.0.60", ] [[package]] @@ -1070,9 +1068,9 @@ dependencies = [ [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] @@ -1100,7 +1098,7 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.53", + "syn 2.0.60", ] [[package]] @@ -1172,9 +1170,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "5.2.0" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" +checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" dependencies = [ "concurrent-queue", "parking", @@ -1193,11 +1191,11 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 5.2.0", + "event-listener 5.3.0", "pin-project-lite", ] @@ -1212,9 +1210,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "femme" @@ -1250,7 +1248,7 @@ checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.4.1", "windows-sys 0.52.0", ] @@ -1349,7 +1347,7 @@ dependencies = [ "cfg-if", "entities", "enum-map", - "getrandom 0.2.12", + "getrandom 0.2.14", "latex2mathml", "log", "maplit", @@ -1463,7 +1461,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.0.1", + "fastrand 2.1.0", "futures-core", "futures-io", "parking", @@ -1478,7 +1476,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.53", + "syn 2.0.60", ] [[package]] @@ -1543,9 +1541,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" dependencies = [ "cfg-if", "js-sys", @@ -1615,9 +1613,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash 0.8.11", "allocator-api2", @@ -1629,7 +1627,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] @@ -1779,7 +1777,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.5.6", + "socket2 0.5.7", "tokio", "tower-service", "tracing", @@ -1788,9 +1786,9 @@ dependencies = [ [[package]] name = "hyper" -version = "1.2.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" +checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" dependencies = [ "bytes", "futures-channel", @@ -1813,9 +1811,9 @@ checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" dependencies = [ "futures-util", "http 1.1.0", - "hyper 1.2.0", + "hyper 1.3.1", "hyper-util", - "rustls 0.22.2", + "rustls 0.22.4", "rustls-pki-types", "tokio", "tokio-rustls", @@ -1833,9 +1831,9 @@ dependencies = [ "futures-util", "http 1.1.0", "http-body 1.0.0", - "hyper 1.2.0", + "hyper 1.3.1", "pin-project-lite", - "socket2 0.5.6", + "socket2 0.5.7", "tokio", "tower", "tower-service", @@ -1877,12 +1875,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.5" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] @@ -1893,7 +1891,7 @@ checksum = "0122b7114117e64a63ac49f752a5ca4624d534c7b1c7de796ac196381cd2d947" dependencies = [ "proc-macro2", "quote", - "syn 2.0.53", + "syn 2.0.60", ] [[package]] @@ -1981,15 +1979,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.28" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] @@ -2005,9 +2003,9 @@ dependencies = [ [[package]] name = "jsonrpsee" -version = "0.22.4" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4b0e68d9af1f066c06d6e2397583795b912d78537d7d907c561e82c13d69fa1" +checksum = "cfdb12a2381ea5b2e68c3469ec604a007b367778cdb14d09612c8069ebd616ad" dependencies = [ "jsonrpsee-core", "jsonrpsee-proc-macros", @@ -2019,9 +2017,9 @@ dependencies = [ [[package]] name = "jsonrpsee-core" -version = "0.22.4" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "274d68152c24aa78977243bb56f28d7946e6aa309945b37d33174a3f92d89a3a" +checksum = "b4b257e1ec385e07b0255dde0b933f948b5c8b8c28d42afda9587c3a967b896d" dependencies = [ "anyhow", "async-trait", @@ -2041,22 +2039,22 @@ dependencies = [ [[package]] name = "jsonrpsee-proc-macros" -version = "0.22.4" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c326f9e95aeff7d707b2ffde72c22a52acc975ba1c48587776c02b90c4747a6" +checksum = "7d0bb047e79a143b32ea03974a6bf59b62c2a4c5f5d42a381c907a8bbb3f75c0" dependencies = [ "heck", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.53", + "syn 2.0.60", ] [[package]] name = "jsonrpsee-server" -version = "0.22.4" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b5bfbda5f8fb63f997102fd18f73e35e34c84c6dcdbdbbe72c6e48f6d2c959b" +checksum = "12d8b6a9674422a8572e0b0abb12feeb3f2aeda86528c80d0350c2bd0923ab41" dependencies = [ "futures-util", "http 0.2.12", @@ -2078,9 +2076,9 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.22.4" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dc828e537868d6b12bbb07ec20324909a22ced6efca0057c825c3e1126b2c6d" +checksum = "150d6168405890a7a3231a3c74843f58b8959471f6df76078db2619ddee1d07d" dependencies = [ "anyhow", "beef", @@ -2144,9 +2142,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.153" +version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "libgit2-sys" @@ -2168,13 +2166,12 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libredox" -version = "0.0.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.5.0", "libc", - "redox_syscall", ] [[package]] @@ -2214,9 +2211,9 @@ checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -2252,7 +2249,7 @@ checksum = "5cf92c10c7e361d6b99666ec1c6f9805b0bea2c3bd8c78dc6fe98ac5bd78db11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.53", + "syn 2.0.60", ] [[package]] @@ -2273,9 +2270,9 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "mime" @@ -2341,9 +2338,9 @@ dependencies = [ [[package]] name = "num" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +checksum = "3135b08af27d103b0a51f2ae0f8632117b7b185ccf931445affa8df530576a41" dependencies = [ "num-bigint", "num-complex", @@ -2509,7 +2506,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.53", + "syn 2.0.60", ] [[package]] @@ -2577,9 +2574,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" dependencies = [ "lock_api", "parking_lot_core", @@ -2587,15 +2584,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.5.1", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] @@ -2632,9 +2629,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.8" +version = "2.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56f8023d0fb78c8e03784ea1c7f3fa36e68a723138990b8d5a47d916b651e7a8" +checksum = "311fb059dee1a7b802f036316d790138c613a4e8b180c822e3925a662e9f0c95" dependencies = [ "memchr", "thiserror", @@ -2643,9 +2640,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.8" +version = "2.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0d24f72393fd16ab6ac5738bc33cdb6a9aa73f8b902e8fe29cf4e67d7dd1026" +checksum = "f73541b156d32197eecda1a4014d7f868fd2bcb3c550d5386087cfba442bf69c" dependencies = [ "pest", "pest_generator", @@ -2653,22 +2650,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.8" +version = "2.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc17e2a6c7d0a492f0158d7a4bd66cc17280308bbaff78d5bef566dca35ab80" +checksum = "c35eeed0a3fab112f75165fdc026b3913f4183133f19b49be773ac9ea966e8bd" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.53", + "syn 2.0.60", ] [[package]] name = "pest_meta" -version = "2.7.8" +version = "2.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "934cd7631c050f4674352a6e835d5f6711ffbfb9345c2fc0107155ac495ae293" +checksum = "2adbf29bb9776f28caece835398781ab24435585fe0d4dc1374a61db5accedca" dependencies = [ "once_cell", "pest", @@ -2774,14 +2771,14 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.53", + "syn 2.0.60", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -2796,7 +2793,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" dependencies = [ "atomic-waker", - "fastrand 2.0.1", + "fastrand 2.1.0", "futures-io", ] @@ -2845,14 +2842,15 @@ dependencies = [ [[package]] name = "polling" -version = "3.5.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24f040dee2588b4963afb4e420540439d126f73fdacf4a9c486a96d840bac3c9" +checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" dependencies = [ "cfg-if", "concurrent-queue", + "hermit-abi", "pin-project-lite", - "rustix 0.38.32", + "rustix 0.38.34", "tracing", "windows-sys 0.52.0", ] @@ -2916,9 +2914,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] @@ -2945,9 +2943,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -3024,7 +3022,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.12", + "getrandom 0.2.14", ] [[package]] @@ -3047,9 +3045,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -3065,28 +3063,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "redis" -version = "0.23.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f49cdc0bb3f412bf8e7d1bd90fe1d9eb10bc5c399ba90973c14662a27b3f8ba" -dependencies = [ - "async-std", - "async-trait", - "bytes", - "combine", - "futures-util", - "itoa", - "percent-encoding", - "pin-project-lite", - "ryu", - "sha1_smol", - "socket2 0.4.10", - "tokio", - "tokio-util", - "url", -] - [[package]] name = "redis" version = "0.25.3" @@ -3094,6 +3070,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6472825949c09872e8f2c50bde59fcefc17748b6be5c90fd67cd8b4daca73bfd" dependencies = [ "arc-swap", + "async-std", "async-trait", "bytes", "combine", @@ -3104,7 +3081,7 @@ dependencies = [ "pin-project-lite", "ryu", "sha1_smol", - "socket2 0.5.6", + "socket2 0.5.7", "tokio", "tokio-retry", "tokio-util", @@ -3120,13 +3097,22 @@ dependencies = [ "bitflags 1.3.2", ] +[[package]] +name = "redox_syscall" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +dependencies = [ + "bitflags 2.5.0", +] + [[package]] name = "redox_users" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ - "getrandom 0.2.12", + "getrandom 0.2.14", "libredox", "thiserror", ] @@ -3162,9 +3148,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "rend" @@ -3226,7 +3212,7 @@ dependencies = [ "http 1.1.0", "http-body 1.0.0", "http-body-util", - "hyper 1.2.0", + "hyper 1.3.1", "hyper-rustls", "hyper-util", "ipnet", @@ -3236,7 +3222,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.22.2", + "rustls 0.22.4", "rustls-pemfile 2.1.2", "rustls-pki-types", "serde", @@ -3262,7 +3248,7 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", "cfg-if", - "getrandom 0.2.12", + "getrandom 0.2.14", "libc", "spin 0.9.8", "untrusted", @@ -3326,16 +3312,16 @@ dependencies = [ [[package]] name = "rsmq_async" -version = "8.0.2" +version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167d3e08ed2181260aedbec34513181e3bfac77667a58b3c33806c8eea536acf" +checksum = "9353df5bcde1ed4b051519047700c5b54477cac3e483fbeaccbd74018116cf31" dependencies = [ "async-trait", "bb8", "lazy_static", "radix_fmt", "rand 0.8.5", - "redis 0.23.3", + "redis", "thiserror", ] @@ -3428,9 +3414,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ "bitflags 2.5.0", "errno", @@ -3441,9 +3427,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.11" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "ring", "rustls-webpki 0.101.7", @@ -3452,14 +3438,14 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.2" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" dependencies = [ "log", "ring", "rustls-pki-types", - "rustls-webpki 0.102.2", + "rustls-webpki 0.102.3", "subtle", "zeroize", ] @@ -3485,9 +3471,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "868e20fada228fefaf6b652e00cc73623d54f8171e7352c18bb281571f2d92da" +checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54" [[package]] name = "rustls-webpki" @@ -3501,9 +3487,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.102.2" +version = "0.102.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf" dependencies = [ "ring", "rustls-pki-types", @@ -3512,9 +3498,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" [[package]] name = "ryu" @@ -3557,7 +3543,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.53", + "syn 2.0.60", ] [[package]] @@ -3596,7 +3582,7 @@ dependencies = [ "proc-macro2", "quote", "sea-bae", - "syn 2.0.53", + "syn 2.0.60", "unicode-ident", ] @@ -3635,7 +3621,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.53", + "syn 2.0.60", "thiserror", ] @@ -3706,7 +3692,7 @@ checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.53", + "syn 2.0.60", ] [[package]] @@ -3731,13 +3717,13 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.53", + "syn 2.0.60", ] [[package]] @@ -3814,9 +3800,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -3879,9 +3865,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", @@ -3979,7 +3965,7 @@ dependencies = [ "once_cell", "paste", "percent-encoding", - "rustls 0.21.11", + "rustls 0.21.12", "rustls-pemfile 1.0.4", "serde", "serde_json", @@ -4165,9 +4151,9 @@ dependencies = [ [[package]] name = "strsim" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" @@ -4191,7 +4177,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.53", + "syn 2.0.60", ] [[package]] @@ -4202,15 +4188,15 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "sval" -version = "2.11.1" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82a2386bea23a121e4e72450306b1dd01078b6399af11b93897bf84640a28a59" +checksum = "53eb957fbc79a55306d5d25d87daf3627bc3800681491cda0709eef36c748bfe" [[package]] name = "sval_buffer" -version = "2.11.1" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16c047898a0e19002005512243bc9ef1c1037aad7d03d6c594e234efec80795" +checksum = "96e860aef60e9cbf37888d4953a13445abf523c534640d1f6174d310917c410d" dependencies = [ "sval", "sval_ref", @@ -4218,18 +4204,18 @@ dependencies = [ [[package]] name = "sval_dynamic" -version = "2.11.1" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a74fb116e2ecdcb280b0108aa2ee4434df50606c3208c47ac95432730eaac20c" +checksum = "ea3f2b07929a1127d204ed7cb3905049381708245727680e9139dac317ed556f" dependencies = [ "sval", ] [[package]] name = "sval_fmt" -version = "2.11.1" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10837b4f0feccef271b2b1c03784e08f6d0bb6d23272ec9e8c777bfadbb8f1b8" +checksum = "c4e188677497de274a1367c4bda15bd2296de4070d91729aac8f0a09c1abf64d" dependencies = [ "itoa", "ryu", @@ -4238,9 +4224,9 @@ dependencies = [ [[package]] name = "sval_json" -version = "2.11.1" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891f5ecdf34ce61a8ab2d10f9cfdc303347b0afec4dad6702757419d2d8312a9" +checksum = "32f456c07dae652744781f2245d5e3b78e6a9ebad70790ac11eb15dbdbce5282" dependencies = [ "itoa", "ryu", @@ -4249,9 +4235,9 @@ dependencies = [ [[package]] name = "sval_nested" -version = "2.11.1" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63fcffb4b79c531f38e3090788b64f3f4d54a180aacf02d69c42fa4e4bf284c3" +checksum = "886feb24709f0476baaebbf9ac10671a50163caa7e439d7a7beb7f6d81d0a6fb" dependencies = [ "sval", "sval_buffer", @@ -4260,18 +4246,18 @@ dependencies = [ [[package]] name = "sval_ref" -version = "2.11.1" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af725f9c2aa7cec4ca9c47da2cc90920c4c82d3fa537094c66c77a5459f5809d" +checksum = "be2e7fc517d778f44f8cb64140afa36010999565528d48985f55e64d45f369ce" dependencies = [ "sval", ] [[package]] name = "sval_serde" -version = "2.11.1" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7589c649a03d21df40b9a926787d2c64937fa1dccec8d87c6cd82989a2e0a4" +checksum = "79bf66549a997ff35cd2114a27ac4b0c2843280f2cfa84b240d169ecaa0add46" dependencies = [ "serde", "sval", @@ -4291,9 +4277,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.53" +version = "2.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" dependencies = [ "proc-macro2", "quote", @@ -4352,8 +4338,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", - "fastrand 2.0.1", - "rustix 0.38.32", + "fastrand 2.1.0", + "rustix 0.38.34", "windows-sys 0.52.0", ] @@ -4383,7 +4369,7 @@ checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" dependencies = [ "proc-macro2", "quote", - "syn 2.0.53", + "syn 2.0.60", ] [[package]] @@ -4464,7 +4450,7 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.6", + "socket2 0.5.7", "tokio-macros", "windows-sys 0.48.0", ] @@ -4477,7 +4463,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.53", + "syn 2.0.60", ] [[package]] @@ -4497,7 +4483,7 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ - "rustls 0.22.2", + "rustls 0.22.4", "rustls-pki-types", "tokio", ] @@ -4538,7 +4524,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.9", + "toml_edit 0.22.12", ] [[package]] @@ -4563,15 +4549,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.9" +version = "0.22.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" +checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.5", + "winnow 0.6.7", ] [[package]] @@ -4622,7 +4608,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.53", + "syn 2.0.60", ] [[package]] @@ -4891,7 +4877,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.53", + "syn 2.0.60", "wasm-bindgen-shared", ] @@ -4925,7 +4911,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.53", + "syn 2.0.60", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4980,7 +4966,7 @@ version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" dependencies = [ - "redox_syscall", + "redox_syscall 0.4.1", "wasite", ] @@ -5025,11 +5011,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -5045,7 +5031,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ "windows-core", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -5054,7 +5040,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -5072,7 +5058,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -5092,17 +5078,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -5113,9 +5100,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -5125,9 +5112,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -5137,9 +5124,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -5149,9 +5142,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -5161,9 +5154,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -5173,9 +5166,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -5185,9 +5178,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" @@ -5200,9 +5193,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.5" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +checksum = "14b9415ee827af173ebb3f15f9083df5a122eb93572ec28741fb153356ea2578" dependencies = [ "memchr", ] @@ -5238,9 +5231,9 @@ dependencies = [ [[package]] name = "xml-rs" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" +checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" [[package]] name = "zerocopy" @@ -5259,7 +5252,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.53", + "syn 2.0.60", ] [[package]] diff --git a/deepwell/Cargo.toml b/deepwell/Cargo.toml index 9169b67c1e..9a1f3946f4 100644 --- a/deepwell/Cargo.toml +++ b/deepwell/Cargo.toml @@ -46,7 +46,7 @@ redis = { version = "0.25", features = ["aio", "connection-manager", "keep-alive ref-map = "0.1" regex = "1" reqwest = { version = "0.12", features = ["json", "rustls-tls"], default-features = false } -rsmq_async = "8" +rsmq_async = "9" rust-s3 = { version = "0.32", features = ["with-tokio"], default-features = false } rust-otp = "2" sea-orm = { version = "0.12", features = ["sqlx-postgres", "runtime-tokio-rustls", "postgres-array", "macros", "with-json", "with-time"], default-features = false } From 3ea26f68124ec03817d08bdfdf2f06be8c61b270 Mon Sep 17 00:00:00 2001 From: Emmie Maeda Date: Tue, 30 Apr 2024 14:26:23 -0400 Subject: [PATCH 3/7] Replace MultiplexRsmq with PooledRsmq. Doesn't yet compile, starting change. --- deepwell/src/api.rs | 4 ++-- deepwell/src/redis.rs | 8 ++++---- deepwell/src/services/context.rs | 6 +++--- deepwell/src/services/job/worker.rs | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/deepwell/src/api.rs b/deepwell/src/api.rs index db2db6df54..3e8ce9656e 100644 --- a/deepwell/src/api.rs +++ b/deepwell/src/api.rs @@ -41,7 +41,7 @@ use crate::{database, redis as redis_db}; use jsonrpsee::server::{RpcModule, Server, ServerHandle}; use jsonrpsee::types::error::ErrorObjectOwned; use redis::aio::ConnectionManager; -use rsmq_async::MultiplexedRsmq; +use rsmq_async::PooledRsmq; use s3::bucket::Bucket; use sea_orm::{DatabaseConnection, TransactionTrait}; use std::fmt::{self, Debug}; @@ -54,7 +54,7 @@ pub struct ServerStateInner { pub config: Config, pub database: DatabaseConnection, pub redis: ConnectionManager, - pub rsmq: MultiplexedRsmq, + pub rsmq: PooledRsmq, pub localizations: Localizations, pub mime_analyzer: MimeAnalyzer, pub s3_bucket: Bucket, diff --git a/deepwell/src/redis.rs b/deepwell/src/redis.rs index 7ad16ac054..8be35eb028 100644 --- a/deepwell/src/redis.rs +++ b/deepwell/src/redis.rs @@ -23,16 +23,16 @@ use crate::services::job::{ }; use anyhow::Result; use redis::aio::ConnectionManager; -use rsmq_async::{MultiplexedRsmq, RsmqConnection}; +use rsmq_async::{PooledRsmq, RsmqConnection}; -pub async fn connect(redis_uri: &str) -> Result<(ConnectionManager, MultiplexedRsmq)> { +pub async fn connect(redis_uri: &str) -> Result<(ConnectionManager, PooledRsmq)> { // Create regular redis client let client = redis::Client::open(redis_uri)?; let rsmq_connection = client.get_multiplexed_tokio_connection().await?; let redis = ConnectionManager::new(client).await?; // Create RSMQ client - let mut rsmq = MultiplexedRsmq::new_with_connection(rsmq_connection, true, None); + let mut rsmq = PooledRsmq::new_with_connection(rsmq_connection, true, None); // Set up queue if it doesn't already exist if !job_queue_exists(&mut rsmq).await? { @@ -53,7 +53,7 @@ pub async fn connect(redis_uri: &str) -> Result<(ConnectionManager, MultiplexedR Ok((redis, rsmq)) } -async fn job_queue_exists(rsmq: &mut MultiplexedRsmq) -> Result { +async fn job_queue_exists(rsmq: &mut PooledRsmq) -> Result { // NOTE: Effectively the same as rsmq.list_queues().await?.contains(JOB_QUEUE_NAME), // except we don't have to deal with the "&String" type issue. let queues = rsmq.list_queues().await?; diff --git a/deepwell/src/services/context.rs b/deepwell/src/services/context.rs index 7f5752a1fc..03926234e1 100644 --- a/deepwell/src/services/context.rs +++ b/deepwell/src/services/context.rs @@ -23,7 +23,7 @@ use crate::config::Config; use crate::locales::Localizations; use crate::services::blob::MimeAnalyzer; use redis::aio::ConnectionManager; -use rsmq_async::MultiplexedRsmq; +use rsmq_async::PooledRsmq; use s3::bucket::Bucket; use sea_orm::DatabaseTransaction; use std::sync::Arc; @@ -58,8 +58,8 @@ impl<'txn> ServiceContext<'txn> { } #[inline] - pub fn rsmq(&self) -> MultiplexedRsmq { - MultiplexedRsmq::clone(&self.state.rsmq) + pub fn rsmq(&self) -> PooledRsmq { + PooledRsmq::clone(&self.state.rsmq) } #[inline] diff --git a/deepwell/src/services/job/worker.rs b/deepwell/src/services/job/worker.rs index 5a5cbced1e..3692ef79fe 100644 --- a/deepwell/src/services/job/worker.rs +++ b/deepwell/src/services/job/worker.rs @@ -23,7 +23,7 @@ use super::prelude::*; use crate::api::ServerState; use crate::services::{PageRevisionService, SessionService, TextService}; -use rsmq_async::{MultiplexedRsmq, RsmqConnection, RsmqMessage}; +use rsmq_async::{PooledRsmq, RsmqConnection, RsmqMessage}; use sea_orm::TransactionTrait; use std::convert::Infallible; use std::sync::Arc; @@ -47,7 +47,7 @@ enum NextJob { #[derive(Debug, Clone)] pub struct JobWorker { state: ServerState, - rsmq: MultiplexedRsmq, + rsmq: PooledRsmq, id: u16, } @@ -70,7 +70,7 @@ impl JobWorker { fn spawn_one(state: &ServerState, id: u16) { info!("Spawning job worker ID {id}"); let state = Arc::clone(state); - let rsmq = MultiplexedRsmq::clone(&state.rsmq); + let rsmq = PooledRsmq::clone(&state.rsmq); let worker = JobWorker { state, rsmq, id }; tokio::spawn(worker.main_loop()); } From 6827b0efda50b954ab66111d08e48b2505b9ca64 Mon Sep 17 00:00:00 2001 From: Emmie Maeda Date: Tue, 30 Apr 2024 17:51:08 -0400 Subject: [PATCH 4/7] Add PooledRsmq connection parsing and creation. --- deepwell/src/redis.rs | 49 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 41 insertions(+), 8 deletions(-) diff --git a/deepwell/src/redis.rs b/deepwell/src/redis.rs index 8be35eb028..d569d6a32e 100644 --- a/deepwell/src/redis.rs +++ b/deepwell/src/redis.rs @@ -23,16 +23,49 @@ use crate::services::job::{ }; use anyhow::Result; use redis::aio::ConnectionManager; -use rsmq_async::{PooledRsmq, RsmqConnection}; +use redis::{ConnectionAddr, ConnectionInfo, IntoConnectionInfo, RedisConnectionInfo}; +use rsmq_async::{PoolOptions, PooledRsmq, RsmqConnection, RsmqOptions}; pub async fn connect(redis_uri: &str) -> Result<(ConnectionManager, PooledRsmq)> { - // Create regular redis client - let client = redis::Client::open(redis_uri)?; - let rsmq_connection = client.get_multiplexed_tokio_connection().await?; - let redis = ConnectionManager::new(client).await?; + // Parse redis connection URI + let mut rsmq = { + let ConnectionInfo { + addr, + redis: + RedisConnectionInfo { + db, + username, + password, + }, + } = redis_uri.into_connection_info()?; - // Create RSMQ client - let mut rsmq = PooledRsmq::new_with_connection(rsmq_connection, true, None); + let db = db + .try_into() + .expect("Database value too large for rsmq-async"); + + let (host, port) = match addr { + ConnectionAddr::Tcp(host, port) => (host, port), + ConnectionAddr::TcpTls { .. } => { + panic!("Redis over TLS not supported by rsmq-async") + } + ConnectionAddr::Unix(_) => { + panic!("Unix socket paths not supported by rsmq-async") + } + }; + + let options = RsmqOptions { + host, + port, + db, + username, + password, + realtime: false, // not used, see crate docs + ns: str!("rsmq"), // namespace for RSMQ + }; + + // Create RSMQ client + PooledRsmq::new(options, PoolOptions::default()).await? + }; // Set up queue if it doesn't already exist if !job_queue_exists(&mut rsmq).await? { @@ -50,7 +83,7 @@ pub async fn connect(redis_uri: &str) -> Result<(ConnectionManager, PooledRsmq)> .await?; } - Ok((redis, rsmq)) + Ok((todo!(), rsmq)) } async fn job_queue_exists(rsmq: &mut PooledRsmq) -> Result { From c5d3b9fdaf7905689c2ec3a9e6874e5a2b7999b5 Mon Sep 17 00:00:00 2001 From: Emmie Maeda Date: Tue, 30 Apr 2024 18:01:54 -0400 Subject: [PATCH 5/7] Build rsmq instance, remove plain redis. --- deepwell/src/api.rs | 8 ++------ deepwell/src/endpoints/misc.rs | 3 +++ deepwell/src/redis.rs | 5 ++--- deepwell/src/services/context.rs | 5 ----- deepwell/src/services/job/worker.rs | 14 +++++++++++++- 5 files changed, 20 insertions(+), 15 deletions(-) diff --git a/deepwell/src/api.rs b/deepwell/src/api.rs index 3e8ce9656e..c41c5828d7 100644 --- a/deepwell/src/api.rs +++ b/deepwell/src/api.rs @@ -40,7 +40,6 @@ use crate::utils::debug_pointer; use crate::{database, redis as redis_db}; use jsonrpsee::server::{RpcModule, Server, ServerHandle}; use jsonrpsee::types::error::ErrorObjectOwned; -use redis::aio::ConnectionManager; use rsmq_async::PooledRsmq; use s3::bucket::Bucket; use sea_orm::{DatabaseConnection, TransactionTrait}; @@ -53,7 +52,6 @@ pub type ServerState = Arc; pub struct ServerStateInner { pub config: Config, pub database: DatabaseConnection, - pub redis: ConnectionManager, pub rsmq: PooledRsmq, pub localizations: Localizations, pub mime_analyzer: MimeAnalyzer, @@ -65,8 +63,7 @@ impl Debug for ServerStateInner { f.debug_struct("ServerStateInner") .field("config", &self.config) .field("database", &self.database) - .field("redis", &debug_pointer(&self.redis)) - .field("rsmq", &self.rsmq) + .field("rsmq", &debug_pointer(&self.rsmq)) .field("localizations", &self.localizations) .field("mime_analyzer", &self.mime_analyzer) .field("s3_bucket", &self.s3_bucket) @@ -83,7 +80,7 @@ pub async fn build_server_state( let database = database::connect(&secrets.database_url).await?; info!("Connecting to Redis"); - let (redis, rsmq) = redis_db::connect(&secrets.redis_url).await?; + let rsmq = redis_db::connect(&secrets.redis_url).await?; // Load localization data info!("Loading localization data"); @@ -114,7 +111,6 @@ pub async fn build_server_state( let state = Arc::new(ServerStateInner { config, database, - redis, rsmq, localizations, mime_analyzer, diff --git a/deepwell/src/endpoints/misc.rs b/deepwell/src/endpoints/misc.rs index 4865eab209..c23d0a10dd 100644 --- a/deepwell/src/endpoints/misc.rs +++ b/deepwell/src/endpoints/misc.rs @@ -37,12 +37,15 @@ async fn postgres_check(ctx: &ServiceContext<'_>) -> Result<()> { } async fn redis_check(ctx: &ServiceContext<'_>) -> Result<()> { + /* ctx.redis() .send_packed_command(redis::Cmd::new().arg("PING")) .await?; debug!("Successfully pinged Redis"); Ok(()) + */ + todo!() } pub async fn ping( diff --git a/deepwell/src/redis.rs b/deepwell/src/redis.rs index d569d6a32e..0d15abae47 100644 --- a/deepwell/src/redis.rs +++ b/deepwell/src/redis.rs @@ -22,11 +22,10 @@ use crate::services::job::{ JOB_QUEUE_DELAY, JOB_QUEUE_MAXIMUM_SIZE, JOB_QUEUE_NAME, JOB_QUEUE_PROCESS_TIME, }; use anyhow::Result; -use redis::aio::ConnectionManager; use redis::{ConnectionAddr, ConnectionInfo, IntoConnectionInfo, RedisConnectionInfo}; use rsmq_async::{PoolOptions, PooledRsmq, RsmqConnection, RsmqOptions}; -pub async fn connect(redis_uri: &str) -> Result<(ConnectionManager, PooledRsmq)> { +pub async fn connect(redis_uri: &str) -> Result { // Parse redis connection URI let mut rsmq = { let ConnectionInfo { @@ -83,7 +82,7 @@ pub async fn connect(redis_uri: &str) -> Result<(ConnectionManager, PooledRsmq)> .await?; } - Ok((todo!(), rsmq)) + Ok(rsmq) } async fn job_queue_exists(rsmq: &mut PooledRsmq) -> Result { diff --git a/deepwell/src/services/context.rs b/deepwell/src/services/context.rs index 03926234e1..644303053c 100644 --- a/deepwell/src/services/context.rs +++ b/deepwell/src/services/context.rs @@ -52,11 +52,6 @@ impl<'txn> ServiceContext<'txn> { &self.state.config } - #[inline] - pub fn redis(&self) -> ConnectionManager { - ConnectionManager::clone(&self.state.redis) - } - #[inline] pub fn rsmq(&self) -> PooledRsmq { PooledRsmq::clone(&self.state.rsmq) diff --git a/deepwell/src/services/job/worker.rs b/deepwell/src/services/job/worker.rs index 3692ef79fe..c4cf11e9c3 100644 --- a/deepwell/src/services/job/worker.rs +++ b/deepwell/src/services/job/worker.rs @@ -23,9 +23,11 @@ use super::prelude::*; use crate::api::ServerState; use crate::services::{PageRevisionService, SessionService, TextService}; +use crate::utils::debug_pointer; use rsmq_async::{PooledRsmq, RsmqConnection, RsmqMessage}; use sea_orm::TransactionTrait; use std::convert::Infallible; +use std::fmt::{self, Debug}; use std::sync::Arc; use std::time::Duration; use tokio::time; @@ -44,7 +46,7 @@ enum NextJob { Done, } -#[derive(Debug, Clone)] +#[derive(Clone)] pub struct JobWorker { state: ServerState, rsmq: PooledRsmq, @@ -253,3 +255,13 @@ impl JobWorker { Ok(JobProcessStatus::ReceivedJob) } } + +impl Debug for JobWorker { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + f.debug_struct("JobWorker") + .field("state", &self.state) + .field("rsmq", &debug_pointer(&self.rsmq)) + .field("id", &self.id) + .finish() + } +} From 4e3a72e2c0e448e9516d1a317a8aac325a90ac82 Mon Sep 17 00:00:00 2001 From: Emmie Maeda Date: Tue, 30 Apr 2024 18:09:43 -0400 Subject: [PATCH 6/7] Return redis::Client in connection stage. --- deepwell/src/api.rs | 5 ++++- deepwell/src/redis.rs | 5 +++-- deepwell/src/services/context.rs | 5 +++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/deepwell/src/api.rs b/deepwell/src/api.rs index c41c5828d7..f37cf817cb 100644 --- a/deepwell/src/api.rs +++ b/deepwell/src/api.rs @@ -52,6 +52,7 @@ pub type ServerState = Arc; pub struct ServerStateInner { pub config: Config, pub database: DatabaseConnection, + pub redis: redis::Client, pub rsmq: PooledRsmq, pub localizations: Localizations, pub mime_analyzer: MimeAnalyzer, @@ -63,6 +64,7 @@ impl Debug for ServerStateInner { f.debug_struct("ServerStateInner") .field("config", &self.config) .field("database", &self.database) + .field("redis", &self.redis) .field("rsmq", &debug_pointer(&self.rsmq)) .field("localizations", &self.localizations) .field("mime_analyzer", &self.mime_analyzer) @@ -80,7 +82,7 @@ pub async fn build_server_state( let database = database::connect(&secrets.database_url).await?; info!("Connecting to Redis"); - let rsmq = redis_db::connect(&secrets.redis_url).await?; + let (redis, rsmq) = redis_db::connect(&secrets.redis_url).await?; // Load localization data info!("Loading localization data"); @@ -111,6 +113,7 @@ pub async fn build_server_state( let state = Arc::new(ServerStateInner { config, database, + redis, rsmq, localizations, mime_analyzer, diff --git a/deepwell/src/redis.rs b/deepwell/src/redis.rs index 0d15abae47..dea8cd3b1a 100644 --- a/deepwell/src/redis.rs +++ b/deepwell/src/redis.rs @@ -25,8 +25,9 @@ use anyhow::Result; use redis::{ConnectionAddr, ConnectionInfo, IntoConnectionInfo, RedisConnectionInfo}; use rsmq_async::{PoolOptions, PooledRsmq, RsmqConnection, RsmqOptions}; -pub async fn connect(redis_uri: &str) -> Result { +pub async fn connect(redis_uri: &str) -> Result<(redis::Client, PooledRsmq)> { // Parse redis connection URI + let redis = redis::Client::open(redis_uri)?; let mut rsmq = { let ConnectionInfo { addr, @@ -82,7 +83,7 @@ pub async fn connect(redis_uri: &str) -> Result { .await?; } - Ok(rsmq) + Ok((redis, rsmq)) } async fn job_queue_exists(rsmq: &mut PooledRsmq) -> Result { diff --git a/deepwell/src/services/context.rs b/deepwell/src/services/context.rs index 644303053c..d44b51bbb1 100644 --- a/deepwell/src/services/context.rs +++ b/deepwell/src/services/context.rs @@ -52,6 +52,11 @@ impl<'txn> ServiceContext<'txn> { &self.state.config } + #[inline] + pub fn redis(&self) -> &redis::Client { + &self.state.redis + } + #[inline] pub fn rsmq(&self) -> PooledRsmq { PooledRsmq::clone(&self.state.rsmq) From 1e20a9a56a21ed834234452e34e5175d7beb4dd0 Mon Sep 17 00:00:00 2001 From: Emmie Maeda Date: Tue, 30 Apr 2024 18:14:26 -0400 Subject: [PATCH 7/7] Connect to Redis each time for ping. --- deepwell/src/endpoints/misc.rs | 7 +++---- deepwell/src/services/context.rs | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/deepwell/src/endpoints/misc.rs b/deepwell/src/endpoints/misc.rs index c23d0a10dd..4999b31c44 100644 --- a/deepwell/src/endpoints/misc.rs +++ b/deepwell/src/endpoints/misc.rs @@ -37,15 +37,14 @@ async fn postgres_check(ctx: &ServiceContext<'_>) -> Result<()> { } async fn redis_check(ctx: &ServiceContext<'_>) -> Result<()> { - /* - ctx.redis() + let mut redis = ctx.redis_connect().await?; + + redis .send_packed_command(redis::Cmd::new().arg("PING")) .await?; debug!("Successfully pinged Redis"); Ok(()) - */ - todo!() } pub async fn ping( diff --git a/deepwell/src/services/context.rs b/deepwell/src/services/context.rs index d44b51bbb1..9074c64e0d 100644 --- a/deepwell/src/services/context.rs +++ b/deepwell/src/services/context.rs @@ -22,7 +22,8 @@ use crate::api::ServerState; use crate::config::Config; use crate::locales::Localizations; use crate::services::blob::MimeAnalyzer; -use redis::aio::ConnectionManager; +use crate::services::error::Result; +use redis::aio::MultiplexedConnection as RedisMultiplexedConnection; use rsmq_async::PooledRsmq; use s3::bucket::Bucket; use sea_orm::DatabaseTransaction; @@ -53,10 +54,19 @@ impl<'txn> ServiceContext<'txn> { } #[inline] - pub fn redis(&self) -> &redis::Client { + pub fn redis_client(&self) -> &redis::Client { &self.state.redis } + pub async fn redis_connect(&self) -> Result { + let conn = self + .redis_client() + .get_multiplexed_tokio_connection() + .await?; + + Ok(conn) + } + #[inline] pub fn rsmq(&self) -> PooledRsmq { PooledRsmq::clone(&self.state.rsmq)