From b8d471ce12addeaf2d3b1b15bae68601d7c6f1f3 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 6 Jun 2024 20:00:12 +0200 Subject: [PATCH 1/4] update nix version for builds Signed-off-by: Robin Appelman --- flake.lock | 32 ++++++++++++++++---------------- flake.nix | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index bca0d4c3..100e343c 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ ] }, "locked": { - "lastModified": 1705943642, - "narHash": "sha256-M/n8k0Ato/WGmNJjtIUQGoooVBXL1ahSveiCK772Dk8=", + "lastModified": 1717704286, + "narHash": "sha256-zrLB/FTKODEAlJjgO8TwbK7teTseYbjLESp8QJ/FJYc=", "owner": "icewind1991", "repo": "cross-naersk", - "rev": "db45d5a45b69d7d246bc748a54cd3cbbd9c47e74", + "rev": "9068daceb8f0d248dcf629944f60e92b81391bdb", "type": "github" }, "original": { @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1698420672, - "narHash": "sha256-/TdeHMPRjjdJub7p7+w55vyABrsJlt5QkznPYy55vKA=", + "lastModified": 1717067539, + "narHash": "sha256-oIs5EF+6VpHJRvvpVWuqCYJMMVW/6h59aYUv9lABLtY=", "owner": "nix-community", "repo": "naersk", - "rev": "aeb58d5e8faead8980a807c840232697982d47b9", + "rev": "fa19d8c135e776dc97f4dcca08656a0eeb28d5c0", "type": "github" }, "original": { @@ -45,16 +45,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1704290814, - "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", + "lastModified": 1717555607, + "narHash": "sha256-WZ1s48OODmRJ3DHC+I/DtM3tDRuRJlNqMvxvAPTD7ec=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", + "rev": "0b8e7a1ae5a94da2e1ee3f3030a32020f6254105", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -78,11 +78,11 @@ ] }, "locked": { - "lastModified": 1705889935, - "narHash": "sha256-77KPBK5e0ACNzIgJDMuptTtEqKvHBxTO3ksqXHHVO+4=", + "lastModified": 1717640276, + "narHash": "sha256-xtWJuHl0Zq1/pibvU7V8+qad4fcNLP4yerO54nr4Hec=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "e36f66bb10b09f5189dc3b1706948eaeb9a1c555", + "rev": "96161e19677e2ae639c41147e422da4d6ec48240", "type": "github" }, "original": { @@ -111,11 +111,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7fabeb07..2bdb4839 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; utils.url = "github:numtide/flake-utils"; naersk.url = "github:nix-community/naersk"; naersk.inputs.nixpkgs.follows = "nixpkgs"; From da90b2b7a004d523d416229b63cc69adb5f9138f Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 6 Jun 2024 20:01:45 +0200 Subject: [PATCH 2/4] enable keep-alive for redis Signed-off-by: Robin Appelman --- Cargo.lock | 1 + Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 747def7e..a5f5bbaf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1720,6 +1720,7 @@ dependencies = [ "pin-project-lite", "rand", "ryu", + "socket2", "tokio", "tokio-util", "url", diff --git a/Cargo.toml b/Cargo.toml index 2f128b8d..a5bc1fe1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" rust-version = "1.74.0" [dependencies] -redis = { version = "0.25.3", default-features = false, features = ["tokio-comp", "aio", "cluster", "cluster-async"] } +redis = { version = "0.25.3", default-features = false, features = ["tokio-comp", "aio", "cluster", "cluster-async", "keep-alive"] } serde = { version = "1.0.203", features = ["derive"] } serde_json = "1.0.117" thiserror = "1.0.61" From 67165d951504470e8b56fbd8b955ebd4d5fb1293 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 6 Jun 2024 20:04:15 +0200 Subject: [PATCH 3/4] cargo updates Signed-off-by: Robin Appelman --- Cargo.lock | 68 +++++++++++++++++++++--------------------- Cargo.toml | 8 ++--- test_client/Cargo.toml | 2 +- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a5f5bbaf..7aff5284 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -101,9 +101,9 @@ dependencies = [ [[package]] name = "anstyle-query" -version = "1.0.3" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" +checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" dependencies = [ "windows-sys 0.52.0", ] @@ -188,9 +188,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.71" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11" dependencies = [ "addr2line", "cc", @@ -595,9 +595,9 @@ dependencies = [ [[package]] name = "flexi_logger" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f248c29a6d4bc5d065c9e9068d858761a0dcd796759f7801cc14db35db23abd8" +checksum = "419c99d8fc346ea0eaeaac2cc3945024d8fe82aa435aefc2fb9fcda1065f8774" dependencies = [ "chrono", "glob", @@ -757,9 +757,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "glob" @@ -957,9 +957,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "0.14.28" +version = "0.14.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" dependencies = [ "bytes", "futures-channel", @@ -1385,9 +1385,9 @@ dependencies = [ [[package]] name = "nu-ansi-term" -version = "0.49.0" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c073d3c1930d0751774acf49e66653acecb416c3a54c6ec095a9b11caddb5a68" +checksum = "dd2800e1520bdc966782168a627aa5d1ad92e33b984bf7c7615d31280c83ff14" dependencies = [ "windows-sys 0.48.0", ] @@ -1451,9 +1451,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.2" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e" dependencies = [ "memchr", ] @@ -1495,9 +1495,9 @@ dependencies = [ [[package]] name = "parse-display" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06af5f9333eb47bd9ba8462d612e37a8328a5cb80b13f0af4de4c3b89f52dee5" +checksum = "914a1c2265c98e2446911282c6ac86d8524f495792c38c5bd884f80499c7538a" dependencies = [ "parse-display-derive", "regex", @@ -1506,9 +1506,9 @@ dependencies = [ [[package]] name = "parse-display-derive" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc9252f259500ee570c75adcc4e317fa6f57a1e47747d622e0bf838002a7b790" +checksum = "2ae7800a4c974efd12df917266338e79a7a74415173caf7e70aa0a0707345281" dependencies = [ "proc-macro2", "quote", @@ -1650,9 +1650,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.84" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] @@ -1704,9 +1704,9 @@ dependencies = [ [[package]] name = "redis" -version = "0.25.3" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6472825949c09872e8f2c50bde59fcefc17748b6be5c90fd67cd8b4daca73bfd" +checksum = "e0d7a6955c7511f60f3ba9e86c6d02b3c3f144f8c24b288d1f4e18074ab8bbec" dependencies = [ "async-trait", "bytes", @@ -2643,9 +2643,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.37.0" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes", @@ -2662,9 +2662,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", @@ -2845,7 +2845,7 @@ dependencies = [ "thiserror", "url", "utf-8", - "webpki-roots 0.26.1", + "webpki-roots 0.26.2", ] [[package]] @@ -2919,9 +2919,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unicode_categories" @@ -2949,7 +2949,7 @@ dependencies = [ "rustls-pki-types", "rustls-webpki 0.102.4", "url", - "webpki-roots 0.26.1", + "webpki-roots 0.26.2", ] [[package]] @@ -3151,9 +3151,9 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "webpki-roots" -version = "0.26.1" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +checksum = "3c452ad30530b54a4d8e71952716a212b08efd0f3562baa66c29a618b07da7c3" dependencies = [ "rustls-pki-types", ] diff --git a/Cargo.toml b/Cargo.toml index a5bc1fe1..5dfb7fdd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,12 +6,12 @@ edition = "2021" rust-version = "1.74.0" [dependencies] -redis = { version = "0.25.3", default-features = false, features = ["tokio-comp", "aio", "cluster", "cluster-async", "keep-alive"] } +redis = { version = "0.25.4", default-features = false, features = ["tokio-comp", "aio", "cluster", "cluster-async", "keep-alive"] } serde = { version = "1.0.203", features = ["derive"] } serde_json = "1.0.117" thiserror = "1.0.61" warp = { version = "0.3.7", features = ["tls"] } -tokio = { version = "1.37.0", features = ["macros", "rt-multi-thread", "signal"] } +tokio = { version = "1.38.0", features = ["macros", "rt-multi-thread", "signal"] } futures = "0.3.30" log = "0.4.21" sqlx = { version = "0.7.4", features = ["runtime-tokio-rustls", "any", "mysql", "sqlite", "postgres"] } @@ -22,11 +22,11 @@ miette = { version = "7.2.0", features = ["fancy"] } smallvec = { version = "1.13.2", features = ["serde"] } reqwest = { version = "0.11.27", default-features = false, features = ["rustls-tls", "json"] } warp-real-ip = "0.2.0" -parse-display = "0.9.0" +parse-display = "0.9.1" percent-encoding = "2.3.1" rand = { version = "0.8.5", features = ["small_rng"] } ahash = "0.8.11" -flexi_logger = { version = "0.28.0", features = ["colors", "is-terminal"] } +flexi_logger = { version = "0.28.1", features = ["colors", "is-terminal"] } tokio-stream = { version = "0.1.15", features = ["net"] } derivative = "2.2.0" nextcloud-config-parser = { version = "0.10.0", features = ["redis-connect"] } diff --git a/test_client/Cargo.toml b/test_client/Cargo.toml index 4cfd0119..2c62ff85 100644 --- a/test_client/Cargo.toml +++ b/test_client/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" tungstenite = { version = "0.21.0", features = ["rustls-tls-webpki-roots"] } serde_json = "1.0.117" ureq = "2.9.7" -flexi_logger = { version = "0.28.0", features = ["colors"] } +flexi_logger = { version = "0.28.1", features = ["colors"] } log = "0.4.21" base64 = "0.22.1" miette = { version = "7.2.0", features = ["fancy"] } From 0f3c4dd0f646b2b8ea4b84d5bef4647d8d5568a7 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 6 Jun 2024 20:21:41 +0200 Subject: [PATCH 4/4] clippy fix Signed-off-by: Robin Appelman --- src/metrics.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/metrics.rs b/src/metrics.rs index 687e0931..8ced7fc8 100644 --- a/src/metrics.rs +++ b/src/metrics.rs @@ -9,6 +9,7 @@ use warp::Filter; pub static METRICS: Metrics = Metrics::new(); +#[derive(Default)] pub struct Metrics { active_connection_count: AtomicUsize, active_user_count: AtomicUsize,