Merge pull request #436 from RaoulHC/raoul/update-axum

Update to axum-0.7/hyper-1.2
johanhelsing · Mar 25, 2024 · d7b6ab0 · d7b6ab0
2 parents 0c128c0 + c00e230
commit d7b6ab0
Show file tree

Hide file tree

Showing 7 changed files with 137 additions and 111 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/matchbox_server/Cargo.toml b/matchbox_server/Cargo.toml
@@ -22,7 +22,7 @@ matchbox_protocol = { version = "0.9", path = "../matchbox_protocol", features =
   "json",
 ] }
 async-trait = "0.1"
-axum = { version = "0.6", features = ["ws"] }
+axum = { version = "0.7", features = ["ws"] }
 tracing = { version = "0.1", features = ["log"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 tower-http = { version = "0.4", features = ["cors", "trace"] }

diff --git a/matchbox_server/src/main.rs b/matchbox_server/src/main.rs
@@ -59,10 +59,7 @@ async fn main() {
         })
         .cors()
         .trace()
-        .mutate_router(|router| {
-            // Apply router transformations
-            router.route("/health", get(|| async { StatusCode::OK }))
-        })
+        .mutate_router(|router| router.route("/health", get(health_handler)))
         .build();
     server
         .serve()

diff --git a/matchbox_signaling/Cargo.toml b/matchbox_signaling/Cargo.toml
@@ -21,10 +21,10 @@ repository = "https://github.com/johanhelsing/matchbox"
 matchbox_protocol = { version = "0.9", path = "../matchbox_protocol", features = [
   "json",
 ] }
-axum = { version = "0.6", features = ["ws"] }
-hyper = { version = "0.14", features = ["server"] }
+axum = { version = "0.7", features = ["ws"] }
+hyper = { version = "1.2", features = ["server"] }
 tracing = { version = "0.1", features = ["log"] }
-tower-http = { version = "0.4", features = ["cors", "trace"] }
+tower-http = { version = "0.5", features = ["cors", "trace"] }
 tokio = { version = "1.32", features = ["macros", "rt-multi-thread"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"

diff --git a/matchbox_signaling/src/error.rs b/matchbox_signaling/src/error.rs
@@ -13,5 +13,9 @@ pub enum Error {
 
     /// Couldn't bind to socket
     #[error("Bind error: {0}")]
-    Bind(hyper::Error),
+    Bind(std::io::Error),
+
+    /// Error on serve
+    #[error("Serve error: {0}")]
+    Serve(std::io::Error),
 }