From e95445d63d578011cb211a49420ca709c40ad689 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CGiems=E2=80=9D?= <“hubert.wabia@gmail.com”>
Date: Thu, 1 Feb 2024 14:13:52 +0100
Subject: [PATCH] bump axum

---
 Cargo.toml                               |  9 ++++-----
 server/src/bin/nightly-connect-server.rs | 13 +++++++++----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 0d15acda..aedbce7b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,15 +17,14 @@ uuid7 = { version = "0.7.2" }
 log = "0.4.20"
 
 futures = "0.3.30"
-axum = { version = "0.6.12", features = ["ws", "macros"] }
-tower = { version = "0.4", features = [
+axum = { version = "0.7.4", features = ["ws", "macros"] }
+tower = { version = "0.4.13", features = [
   "util",
   "timeout",
   "load-shed",
   "limit",
 ] }
-tower-http = { version = "0.4.3", features = ["cors", "trace"] }
-hyper = { version = "0.14.14", features = ["stream"] }
+tower-http = { version = "0.5.1", features = ["cors", "trace"] }
 reqwest = "0.11.24"
-tokio = { version = "1.26.0", features = ["full"] }
+tokio = { version = "1.35.1", features = ["full"] }
 async-trait = "0.1.77"
\ No newline at end of file
diff --git a/server/src/bin/nightly-connect-server.rs b/server/src/bin/nightly-connect-server.rs
index 61bbfbb4..1add9f03 100644
--- a/server/src/bin/nightly-connect-server.rs
+++ b/server/src/bin/nightly-connect-server.rs
@@ -1,6 +1,5 @@
 use server::router::get_router;
 use std::net::SocketAddr;
-use std::str::FromStr;
 use std::sync::mpsc::channel;
 
 #[tokio::main]
@@ -8,14 +7,20 @@ async fn main() {
     dotenvy::dotenv().expect(".env file not found");
 
     let router = get_router().await;
-    let socket = SocketAddr::from_str("127.0.0.1:6969").unwrap();
+    let listener = tokio::net::TcpListener::bind(&"127.0.0.1:6969")
+        .await
+        .expect("Failed to bind socket");
 
-    let server = axum::Server::bind(&socket).serve(
+    let server = axum::serve(
+        listener,
         router
             .clone()
             .into_make_service_with_connect_info::<SocketAddr>(),
     );
-    tokio::spawn(server);
+
+    tokio::spawn(async move {
+        server.await.unwrap();
+    });
 
     let (tx, rx) = channel();
     ctrlc::set_handler(move || tx.send(()).expect("Could not send signal on channel."))