refactor: extract struct StatsEventSender

josecelano · josecelano · commit a334f17e5f62 · 2022-10-24T16:39:10.000+01:00
diff --git a/src/tracker/statistics.rs b/src/tracker/statistics.rs
@@ -62,24 +62,31 @@ pub struct StatsTracker {
 }
 
 impl StatsTracker {
-    pub fn new_active_instance() -> Self {
-        Self::new_instance(true)
-    }
+    pub fn new_active_instance() -> (Self, StatsEventSender) {
+        let mut stats_tracker = Self {
+            channel_sender: None,
+            stats: Arc::new(RwLock::new(TrackerStatistics::new())),
+        };
 
-    pub fn new_inactive_instance() -> Self {
-        Self::new_instance(false)
+        let stats_event_sender = stats_tracker.run_worker();
+
+        (stats_tracker, stats_event_sender)
     }
 
-    pub fn new_instance(active: bool) -> Self {
-        let mut stats_tracker = Self {
+    pub fn new_inactive_instance() -> Self {
+        Self {
             channel_sender: None,
             stats: Arc::new(RwLock::new(TrackerStatistics::new())),
-        };
+        }
+    }
 
-        if active {
-            stats_tracker.run_worker();
+    pub fn new_instance(active: bool) -> Self {
+        if !active {
+            return Self::new_inactive_instance();
         }
 
+        let (stats_tracker, _stats_event_sender) = Self::new_active_instance();
+
         stats_tracker
     }
 
@@ -90,11 +97,11 @@ impl StatsTracker {
         }
     }
 
-    pub fn run_worker(&mut self) {
+    pub fn run_worker(&mut self) -> StatsEventSender {
         let (tx, mut rx) = mpsc::channel::<TrackerStatisticsEvent>(CHANNEL_BUFFER_SIZE);
 
         // set send channel on stats_tracker
-        self.channel_sender = Some(tx);
+        self.channel_sender = Some(tx.clone());
 
         let stats = self.stats.clone();
 
@@ -142,6 +149,8 @@ impl StatsTracker {
                 drop(stats_lock);
             }
         });
+
+        StatsEventSender { sender: tx }
     }
 }
 
@@ -161,6 +170,17 @@ impl TrackerStatisticsEventSender for StatsTracker {
     }
 }
 
+pub struct StatsEventSender {
+    sender: Sender<TrackerStatisticsEvent>,
+}
+
+#[async_trait]
+impl TrackerStatisticsEventSender for StatsEventSender {
+    async fn send_event(&self, event: TrackerStatisticsEvent) -> Option<Result<(), SendError<TrackerStatisticsEvent>>> {
+        Some(self.sender.send(event).await)
+    }
+}
+
 #[async_trait]
 pub trait TrackerStatisticsRepository: Sync + Send {
     async fn get_stats(&self) -> RwLockReadGuard<'_, TrackerStatistics>;
diff --git a/src/udp/handlers.rs b/src/udp/handlers.rs
@@ -271,19 +271,24 @@ mod tests {
 
     fn initialized_public_tracker() -> Arc<TorrentTracker> {
         let configuration = Arc::new(TrackerConfigurationBuilder::default().with_mode(TrackerMode::Public).into());
-        Arc::new(TorrentTracker::new(configuration, Box::new(StatsTracker::new_active_instance())).unwrap())
+        initialized_tracker(configuration)
     }
 
     fn initialized_private_tracker() -> Arc<TorrentTracker> {
         let configuration = Arc::new(TrackerConfigurationBuilder::default().with_mode(TrackerMode::Private).into());
-        Arc::new(TorrentTracker::new(configuration, Box::new(StatsTracker::new_active_instance())).unwrap())
+        initialized_tracker(configuration)
     }
 
     fn initialized_whitelisted_tracker() -> Arc<TorrentTracker> {
         let configuration = Arc::new(TrackerConfigurationBuilder::default().with_mode(TrackerMode::Listed).into());
-        Arc::new(TorrentTracker::new(configuration, Box::new(StatsTracker::new_active_instance())).unwrap())
+        initialized_tracker(configuration)
     }
 
+    fn initialized_tracker(configuration: Arc<Configuration>) -> Arc<TorrentTracker> {
+        let (stats_tracker, _stats_event_sender) = StatsTracker::new_active_instance();
+        Arc::new(TorrentTracker::new(configuration, Box::new(stats_tracker)).unwrap())
+    }    
+
     fn sample_ipv4_remote_addr() -> SocketAddr {
         sample_ipv4_socket_address()
     }
@@ -969,8 +974,8 @@ mod tests {
                 #[tokio::test]
                 async fn the_peer_ip_should_be_changed_to_the_external_ip_in_the_tracker_configuration() {
                     let configuration = Arc::new(TrackerConfigurationBuilder::default().with_external_ip("::126.0.0.1").into());
-                    let tracker =
-                        Arc::new(TorrentTracker::new(configuration, Box::new(StatsTracker::new_active_instance())).unwrap());
+                    let (stats_tracker, _stats_event_sender) = StatsTracker::new_active_instance();
+                    let tracker = Arc::new(TorrentTracker::new(configuration, Box::new(stats_tracker)).unwrap());
 
                     let loopback_ipv4 = Ipv4Addr::new(127, 0, 0, 1);
                     let loopback_ipv6 = Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 1);
