refactor: remove duplicate code

Author: josecelano

src/app.rs

@@ -28,17 +28,28 @@ use torrust_server_lib::registar::Registar;
 use torrust_tracker_configuration::Configuration;
 use tracing::instrument;
 
+use crate::bootstrap;
 use crate::bootstrap::jobs::{health_check_api, http_tracker, torrent_cleanup, tracker_apis, udp_tracker};
 use crate::container::AppContainer;
 
+pub async fn run() -> (Arc<AppContainer>, Vec<JoinHandle<()>>, Registar) {
+    let (config, app_container) = bootstrap::app::setup();
+
+    let app_container = Arc::new(app_container);
+
+    let (jobs, registar) = start(&config, &app_container).await;
+
+    (app_container, jobs, registar)
+}
+
 /// # Panics
 ///
 /// Will panic if:
 ///
 /// - Can't retrieve tracker keys from database.
 /// - Can't load whitelist from database.
 #[instrument(skip(config, app_container))]
-pub async fn start(config: &Configuration, app_container: &Arc<AppContainer>) -> Vec<JoinHandle<()>> {
+pub async fn start(config: &Configuration, app_container: &Arc<AppContainer>) -> (Vec<JoinHandle<()>>, Registar) {
     if config.http_api.is_none()
         && (config.udp_trackers.is_none() || config.udp_trackers.as_ref().map_or(true, std::vec::Vec::is_empty))
         && (config.http_trackers.is_none() || config.http_trackers.as_ref().map_or(true, std::vec::Vec::is_empty))
@@ -143,5 +154,5 @@ pub async fn start(config: &Configuration, app_container: &Arc<AppContainer>) ->
     // Start Health Check API
     jobs.push(health_check_api::start_job(&config.health_check_api, registar.entries()).await);
 
-    jobs
+    (jobs, registar)
 }

src/console/profiling.rs

@@ -184,7 +184,7 @@ pub async fn run() {
 
     let app_container = Arc::new(app_container);
 
-    let jobs = app::start(&config, &app_container).await;
+    let (jobs, _registar) = app::start(&config, &app_container).await;
 
     // Run the tracker for a fixed duration
     let run_duration = sleep(Duration::from_secs(duration_secs));

src/main.rs

@@ -1,14 +1,8 @@
-use std::sync::Arc;
-
-use torrust_tracker_lib::{app, bootstrap};
+use torrust_tracker_lib::app;
 
 #[tokio::main]
 async fn main() {
-    let (config, app_container) = bootstrap::app::setup();
-
-    let app_container = Arc::new(app_container);
-
-    let jobs = app::start(&config, &app_container).await;
+    let (_app_container, jobs, _registar) = app::run().await;
 
     // handle the signals
     tokio::select! {

tests/servers/api/contract/stats/mod.rs

@@ -1,6 +1,5 @@
 use std::env;
 use std::str::FromStr as _;
-use std::sync::Arc;
 
 use bittorrent_primitives::info_hash::InfoHash;
 use bittorrent_tracker_client::http::client::requests::announce::QueryBuilder;
@@ -10,7 +9,7 @@ use serde::Deserialize;
 use tokio::time::Duration;
 use torrust_rest_tracker_api_client::connection_info::{ConnectionInfo, Origin};
 use torrust_rest_tracker_api_client::v1::client::Client as TrackerApiClient;
-use torrust_tracker_lib::{app, bootstrap};
+use torrust_tracker_lib::app;
 
 #[tokio::test]
 async fn the_stats_api_endpoint_should_return_the_global_stats() {
@@ -48,11 +47,7 @@ async fn the_stats_api_endpoint_should_return_the_global_stats() {
 
     env::set_var("TORRUST_TRACKER_CONFIG_TOML", config_with_two_http_trackers);
 
-    let (config, app_container) = bootstrap::app::setup();
-
-    let app_container = Arc::new(app_container);
-
-    let _jobs = app::start(&config, &app_container).await;
+    let (_app_container, _jobs, _registar) = app::run().await;
 
     announce_to_tracker("http://127.0.0.1:7272").await;
     announce_to_tracker("http://127.0.0.1:7373").await;