feat!: [#591] use full socket addr in net config instead of only the port

josecelano · josecelano · commit cb8935b86382 · 2024-06-13T16:22:29.000+01:00
Old:

```toml
[net]
port = 3001
```

New:

```toml
[net]
bind_address = "0.0.0.0:3001"
```
diff --git a/src/app.rs b/src/app.rs
@@ -57,8 +57,7 @@ pub async fn run(configuration: Configuration, api_version: &Version) -> Running
     let importer_torrent_info_update_interval = settings.tracker_statistics_importer.torrent_info_update_interval;
     let importer_port = settings.tracker_statistics_importer.port;
     // From [net] config
-    let net_ip = settings.net.bind_address.ip().to_string();
-    let net_port = settings.net.bind_address.port();
+    let config_bind_address = settings.net.bind_address;
     let opt_net_tsl = settings.net.tsl.clone();
 
     // IMPORTANT: drop settings before starting server to avoid read locks that
@@ -181,7 +180,7 @@ pub async fn run(configuration: Configuration, api_version: &Version) -> Running
     );
 
     // Start API server
-    let running_api = web::api::start(app_data, &net_ip, net_port, opt_net_tsl, api_version).await;
+    let running_api = web::api::start(app_data, config_bind_address, opt_net_tsl, api_version).await;
 
     // Full running application
     Running {
diff --git a/src/web/api/mod.rs b/src/web/api/mod.rs
@@ -38,12 +38,11 @@ pub struct Running {
 #[must_use]
 pub async fn start(
     app_data: Arc<AppData>,
-    net_ip: &str,
-    net_port: u16,
+    config_bind_address: SocketAddr,
     opt_tsl: Option<Tsl>,
     implementation: &Version,
 ) -> api::Running {
     match implementation {
-        Version::V1 => server::start(app_data, net_ip, net_port, opt_tsl).await,
+        Version::V1 => server::start(app_data, config_bind_address, opt_tsl).await,
     }
 }
diff --git a/src/web/api/server/mod.rs b/src/web/api/server/mod.rs
@@ -28,11 +28,7 @@ pub type DynError = Arc<dyn std::error::Error + Send + Sync>;
 /// # Panics
 ///
 /// Panics if the API server can't be started.
-pub async fn start(app_data: Arc<AppData>, net_ip: &str, net_port: u16, opt_tsl: Option<Tsl>) -> Running {
-    let config_socket_addr: SocketAddr = format!("{net_ip}:{net_port}")
-        .parse()
-        .expect("API server socket address to be valid.");
-
+pub async fn start(app_data: Arc<AppData>, config_bind_address: SocketAddr, opt_tsl: Option<Tsl>) -> Running {
     let opt_rust_tls_config = make_rust_tls(&opt_tsl)
         .await
         .map(|tls| tls.expect("it should have a valid net tls configuration"));
@@ -42,9 +38,9 @@ pub async fn start(app_data: Arc<AppData>, net_ip: &str, net_port: u16, opt_tsl:
 
     // Run the API server
     let join_handle = tokio::spawn(async move {
-        info!("Starting API server with net config: {} ...", config_socket_addr);
+        info!("Starting API server with net config: {} ...", config_bind_address);
 
-        start_server(config_socket_addr, app_data.clone(), tx_start, rx_halt, opt_rust_tls_config).await;
+        start_server(config_bind_address, app_data.clone(), tx_start, rx_halt, opt_rust_tls_config).await;
 
         info!("API server stopped");
 
