feat: [torrust#1477] add server address to http server shutdown logs

Author: josecelano

packages/axum-health-check-api-server/src/server.rs

@@ -113,6 +113,7 @@ pub fn start(
         handle.clone(),
         rx_halt,
         format!("Shutting down http server on socket address: {address}"),
+        address,
     ));
 
     let running = axum_server::from_tcp(socket)

packages/axum-http-tracker-server/src/server.rs

@@ -60,6 +60,7 @@ impl Launcher {
             handle.clone(),
             rx_halt,
             format!("Shutting down HTTP server on socket address: {address}"),
+            address,
         ));
 
         let tls = self.tls.clone();

packages/axum-rest-tracker-api-server/src/server.rs

@@ -257,6 +257,7 @@ impl Launcher {
             handle.clone(),
             rx_halt,
             format!("Shutting down tracker API server on socket address: {address}"),
+            address,
         ));
 
         let tls = self.tls.clone();

packages/axum-server/src/signals.rs

@@ -1,31 +1,38 @@
+use std::net::SocketAddr;
 use std::time::Duration;
 
 use tokio::time::{sleep, Instant};
 use torrust_server_lib::signals::{shutdown_signal_with_message, Halted};
 use tracing::instrument;
 
 #[instrument(skip(handle, rx_halt, message))]
-pub async fn graceful_shutdown(handle: axum_server::Handle, rx_halt: tokio::sync::oneshot::Receiver<Halted>, message: String) {
-    shutdown_signal_with_message(rx_halt, message).await;
+pub async fn graceful_shutdown(
+    handle: axum_server::Handle,
+    rx_halt: tokio::sync::oneshot::Receiver<Halted>,
+    message: String,
+    address: SocketAddr,
+) {
+    shutdown_signal_with_message(rx_halt, message.clone()).await;
 
     let grace_period = Duration::from_secs(90);
     let max_wait = Duration::from_secs(95);
     let start = Instant::now();
 
     handle.graceful_shutdown(Some(grace_period));
 
-    tracing::info!("!! Shutting down http server in {} seconds !!", grace_period.as_secs());
+    tracing::info!("!! {} in {} seconds !!", message, grace_period.as_secs());
 
     loop {
         if handle.connection_count() == 0 {
-            tracing::info!("All connections closed, shutting down server");
+            tracing::info!("All connections closed, shutting down server in address {}", address);
             break;
         }
 
         if start.elapsed() >= max_wait {
             tracing::warn!(
-                "Shutdown timeout of {} seconds reached. Forcing shutdown with {} active connections.",
+                "Shutdown timeout of {} seconds reached. Forcing shutdown in address {} with {} active connections.",
                 max_wait.as_secs(),
+                address,
                 handle.connection_count()
             );
             break;