Merge branch 'sozu-proxy:main' into ci

bin/Cargo.toml

@@ -5,7 +5,7 @@ repository = "https://github.com/sozu-proxy/sozu"
 readme = "README.md"
 documentation = "https://docs.rs/sozu"
 homepage = "https://sozu.io"
-version = "0.15.18"
+version = "0.15.19"
 license = "AGPL-3.0"
 authors = [
   "Geoffroy Couprie <[email protected]>",
@@ -14,39 +14,28 @@ authors = [
   "Florentin Dubois <[email protected]>",
 ]
 categories = ["network-programming"]
-edition="2021"
+edition = "2021"
 rust-version = "1.70.0"
-include = [
-  "README.md",
-  "Cargo.toml",
-  "src/**/*",
-]
+include = ["README.md", "Cargo.toml", "src/**/*"]
 
 [dependencies]
-anyhow = "^1.0.75"
-async-dup = "^1.2.2"
-async-io = "^1.13.0"
-clap = { version = "^4.4.6", features = ["derive"] }
-futures = "^0.3.28"
-futures-lite = "^1.13.0"
-hex = "^0.4.3"
+clap = { version = "^4.4.18", features = ["derive"] }
 jemallocator = { version = "^0.5.4", optional = true }
-libc = "^0.2.149"
+libc = "^0.2.152"
 log = "^0.4.20"
-mio = { version = "^0.8.8", features = ["os-poll", "net"] }
+mio = { version = "^0.8.10", features = ["os-poll", "net"] }
 nix = { version = "^0.27.1", features = ["signal", "fs"] }
 nom = "^7.1.3"
 paw = "^1.0.0"
-serde = { version = "^1.0.188", features = ["derive"] }
-serde_json = "^1.0.107"
+serde = { version = "^1.0.195", features = ["derive"] }
+serde_json = "^1.0.111"
 time = "^0.3.29"
-regex = "^1.10.0"
-smol = "^1.3.0"
-tempfile = "^3.8.0"
-termion = "^2.0.1"
+tempfile = "^3.9.0"
+termion = "^3.0.0"
+sozu-command-lib = { path = "../command", version = "^0.15.19" }
+sozu-lib = { path = "../lib", version = "^0.15.19" }
+thiserror = "^1.0.49"
 
-sozu-command-lib = { path = "../command", version = "^0.15.18" }
-sozu-lib = { path = "../lib", version = "^0.15.18" }
 
 [target.'cfg(target_os="linux")'.dependencies]
 num_cpus = "^1.16.0"

bin/src/cli.rs

@@ -109,7 +109,10 @@ pub enum SubCmd {
         #[clap(long = "hard", help = "do not wait for connections to finish")]
         hard: bool,
     },
-    #[clap(name = "upgrade", about = "upgrade the proxy")]
+    #[clap(
+        name = "upgrade",
+        about = "upgrade the main process OR a specific worker. Specify a longer timeout."
+    )]
     Upgrade {
         #[clap(long = "worker", help = "upgrade a specific worker")]
         worker: Option<u32>,
@@ -220,6 +223,11 @@ pub enum MetricsCmd {
             // parse(try_from_str = split_slash)
         )]
         backends: Vec<String>,
+        #[clap(
+            long = "no-clusters",
+            help = "get only the metrics of main process and workers (no cluster metrics)"
+        )]
+        no_clusters: bool,
     },
 }