Merge pull request #466 from nextcloud/build-updates

Build updates
nextcloud · Jun 24, 2024 · 30ea145 · 30ea145
2 parents 4ed9f12 + 0f3c4dd
commit 30ea145
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 56 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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"] }
+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/flake.lock b/flake.lock
diff --git 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";

diff --git 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,

diff --git 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"] }