refactor: extract bootstrap mod

src/setup.rs → src/bootstrap/jobs/mod.rs

@@ -1,10 +1,14 @@
+pub mod http_tracker;
+pub mod torrent_cleanup;
+pub mod tracker_apis;
+pub mod udp_tracker;
+
 use std::sync::Arc;
 
 use log::warn;
 use tokio::task::JoinHandle;
 use torrust_tracker_configuration::Configuration;
 
-use crate::jobs::{http_tracker, torrent_cleanup, tracker_apis, udp_tracker};
 use crate::servers::http::Version;
 use crate::tracker;
 

src/bootstrap/mod.rs

@@ -0,0 +1,3 @@
+pub mod jobs;
+pub mod logging;
+pub mod stats;

src/stats.rs → src/bootstrap/stats.rs

@@ -1,7 +1,7 @@
 use crate::tracker::statistics;
 
 #[must_use]
-pub fn setup_statistics(tracker_usage_statistics: bool) -> (Option<Box<dyn statistics::EventSender>>, statistics::Repo) {
+pub fn setup(tracker_usage_statistics: bool) -> (Option<Box<dyn statistics::EventSender>>, statistics::Repo) {
     let mut stats_event_sender = None;
 
     let mut stats_tracker = statistics::Keeper::new();
@@ -15,13 +15,13 @@ pub fn setup_statistics(tracker_usage_statistics: bool) -> (Option<Box<dyn stati
 
 #[cfg(test)]
 mod test {
-    use crate::stats::setup_statistics;
+    use super::setup;
 
     #[tokio::test]
     async fn should_not_send_any_event_when_statistics_are_disabled() {
         let tracker_usage_statistics = false;
 
-        let (stats_event_sender, _stats_repository) = setup_statistics(tracker_usage_statistics);
+        let (stats_event_sender, _stats_repository) = setup(tracker_usage_statistics);
 
         assert!(stats_event_sender.is_none());
     }
@@ -30,7 +30,7 @@ mod test {
     async fn should_send_events_when_statistics_are_enabled() {
         let tracker_usage_statistics = true;
 
-        let (stats_event_sender, _stats_repository) = setup_statistics(tracker_usage_statistics);
+        let (stats_event_sender, _stats_repository) = setup(tracker_usage_statistics);
 
         assert!(stats_event_sender.is_some());
     }

src/lib.rs

@@ -1,9 +1,6 @@
-pub mod jobs;
-pub mod logging;
+pub mod bootstrap;
 pub mod protocol;
 pub mod servers;
-pub mod setup;
-pub mod stats;
 pub mod tracker;
 
 #[macro_use]

src/main.rs

@@ -2,8 +2,8 @@ use std::env;
 use std::sync::Arc;
 
 use log::info;
-use torrust_tracker::stats::setup_statistics;
-use torrust_tracker::{ephemeral_instance_keys, logging, setup, static_time, tracker};
+use torrust_tracker::bootstrap::stats::setup;
+use torrust_tracker::{bootstrap, ephemeral_instance_keys, static_time, tracker};
 use torrust_tracker_configuration::Configuration;
 
 #[tokio::main]
@@ -27,7 +27,7 @@ async fn main() {
     };
 
     // Initialize statistics
-    let (stats_event_sender, stats_repository) = setup_statistics(config.tracker_usage_statistics);
+    let (stats_event_sender, stats_repository) = setup(config.tracker_usage_statistics);
 
     // Initialize Torrust tracker
     let tracker = match tracker::Tracker::new(config.clone(), stats_event_sender, stats_repository) {
@@ -38,10 +38,10 @@ async fn main() {
     };
 
     // Initialize logging
-    logging::setup(&config);
+    bootstrap::logging::setup(&config);
 
     // Run jobs
-    let jobs = setup::setup(&config, tracker.clone()).await;
+    let jobs = bootstrap::jobs::setup(&config, tracker.clone()).await;
 
     // handle the signals here
     tokio::select! {

tests/common/tracker.rs

@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use torrust_tracker::tracker::services::common::tracker_factory;
 use torrust_tracker::tracker::Tracker;
-use torrust_tracker::{ephemeral_instance_keys, logging, static_time};
+use torrust_tracker::{bootstrap, ephemeral_instance_keys, static_time};
 
 // TODO: Move to test-helpers crate once `Tracker` is isolated.
 #[allow(clippy::module_name_repetitions)]
@@ -14,7 +14,7 @@ pub fn new_tracker(configuration: Arc<torrust_tracker_configuration::Configurati
     lazy_static::initialize(&ephemeral_instance_keys::RANDOM_SEED);
 
     // Initialize logging
-    logging::setup(&configuration);
+    bootstrap::logging::setup(&configuration);
 
     Arc::new(tracker_factory(configuration))
 }