Skip to content

Commit 6d50a78

Browse files
josecelanojosecelano
committed
refactor: normalize container field names
1 parent 74e174d commit 6d50a78

File tree

11 files changed

+67
-83
lines changed

11 files changed

+67
-83
lines changed

‎packages/http-tracker-core/src/container.rs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -45,21 +45,21 @@ impl HttpTrackerCoreContainer {
4545
Arc::new(Self {
4646
tracker_core_container: tracker_core_container.clone(),
4747
http_tracker_config: http_tracker_config.clone(),
48-
stats_keeper: http_tracker_core_services.http_stats_keeper.clone(),
49-
stats_event_sender: http_tracker_core_services.http_stats_event_sender.clone(),
50-
stats_repository: http_tracker_core_services.http_stats_repository.clone(),
51-
announce_service: http_tracker_core_services.http_announce_service.clone(),
52-
scrape_service: http_tracker_core_services.http_scrape_service.clone(),
48+
stats_keeper: http_tracker_core_services.stats_keeper.clone(),
49+
stats_event_sender: http_tracker_core_services.stats_event_sender.clone(),
50+
stats_repository: http_tracker_core_services.stats_repository.clone(),
51+
announce_service: http_tracker_core_services.announce_service.clone(),
52+
scrape_service: http_tracker_core_services.scrape_service.clone(),
5353
})
5454
}
5555
}
5656

5757
pub struct HttpTrackerCoreServices {
58-
pub http_stats_keeper: Arc<statistics::keeper::Keeper>,
59-
pub http_stats_event_sender: Arc<Option<Box<dyn event::sender::Sender>>>,
60-
pub http_stats_repository: Arc<statistics::repository::Repository>,
61-
pub http_announce_service: Arc<services::announce::AnnounceService>,
62-
pub http_scrape_service: Arc<services::scrape::ScrapeService>,
58+
pub stats_keeper: Arc<statistics::keeper::Keeper>,
59+
pub stats_event_sender: Arc<Option<Box<dyn event::sender::Sender>>>,
60+
pub stats_repository: Arc<statistics::repository::Repository>,
61+
pub announce_service: Arc<services::announce::AnnounceService>,
62+
pub scrape_service: Arc<services::scrape::ScrapeService>,
6363
}
6464

6565
impl HttpTrackerCoreServices {
@@ -86,11 +86,11 @@ impl HttpTrackerCoreServices {
8686
));
8787

8888
Arc::new(Self {
89-
http_stats_keeper,
90-
http_stats_event_sender,
91-
http_stats_repository,
92-
http_announce_service,
93-
http_scrape_service,
89+
stats_keeper: http_stats_keeper,
90+
stats_event_sender: http_stats_event_sender,
91+
stats_repository: http_stats_repository,
92+
announce_service: http_announce_service,
93+
scrape_service: http_scrape_service,
9494
})
9595
}
9696
}

‎packages/rest-tracker-api-core/src/container.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ impl TrackerHttpApiCoreContainer {
5656
http_stats_repository: http_tracker_core_container.stats_repository.clone(),
5757

5858
ban_service: udp_tracker_core_container.ban_service.clone(),
59-
udp_core_stats_repository: udp_tracker_core_container.udp_core_stats_repository.clone(),
59+
udp_core_stats_repository: udp_tracker_core_container.stats_repository.clone(),
6060

61-
udp_server_stats_repository: udp_tracker_server_container.udp_server_stats_repository.clone(),
61+
udp_server_stats_repository: udp_tracker_server_container.stats_repository.clone(),
6262

6363
http_api_config: http_api_config.clone(),
6464
})

‎packages/udp-tracker-core/src/container.rs‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ pub struct UdpTrackerCoreContainer {
1717

1818
// `UdpTrackerCoreServices`
1919
pub stats_keeper: Arc<statistics::keeper::Keeper>,
20-
pub udp_core_stats_event_sender: Arc<Option<Box<dyn event::sender::Sender>>>,
21-
pub udp_core_stats_repository: Arc<statistics::repository::Repository>,
20+
pub stats_event_sender: Arc<Option<Box<dyn event::sender::Sender>>>,
21+
pub stats_repository: Arc<statistics::repository::Repository>,
2222
pub ban_service: Arc<RwLock<BanService>>,
2323
pub connect_service: Arc<ConnectService>,
2424
pub announce_service: Arc<AnnounceService>,
@@ -54,24 +54,24 @@ impl UdpTrackerCoreContainer {
5454

5555
// `UdpTrackerCoreServices`
5656
stats_keeper: udp_tracker_core_services.stats_keeper.clone(),
57-
udp_core_stats_event_sender: udp_tracker_core_services.udp_core_stats_event_sender.clone(),
58-
udp_core_stats_repository: udp_tracker_core_services.udp_core_stats_repository.clone(),
59-
ban_service: udp_tracker_core_services.udp_ban_service.clone(),
60-
connect_service: udp_tracker_core_services.udp_connect_service.clone(),
61-
announce_service: udp_tracker_core_services.udp_announce_service.clone(),
62-
scrape_service: udp_tracker_core_services.udp_scrape_service.clone(),
57+
stats_event_sender: udp_tracker_core_services.stats_event_sender.clone(),
58+
stats_repository: udp_tracker_core_services.stats_repository.clone(),
59+
ban_service: udp_tracker_core_services.ban_service.clone(),
60+
connect_service: udp_tracker_core_services.connect_service.clone(),
61+
announce_service: udp_tracker_core_services.announce_service.clone(),
62+
scrape_service: udp_tracker_core_services.scrape_service.clone(),
6363
})
6464
}
6565
}
6666

6767
pub struct UdpTrackerCoreServices {
6868
pub stats_keeper: Arc<statistics::keeper::Keeper>,
69-
pub udp_core_stats_event_sender: Arc<Option<Box<dyn event::sender::Sender>>>,
70-
pub udp_core_stats_repository: Arc<statistics::repository::Repository>,
71-
pub udp_ban_service: Arc<RwLock<services::banning::BanService>>,
72-
pub udp_connect_service: Arc<services::connect::ConnectService>,
73-
pub udp_announce_service: Arc<services::announce::AnnounceService>,
74-
pub udp_scrape_service: Arc<services::scrape::ScrapeService>,
69+
pub stats_event_sender: Arc<Option<Box<dyn event::sender::Sender>>>,
70+
pub stats_repository: Arc<statistics::repository::Repository>,
71+
pub ban_service: Arc<RwLock<services::banning::BanService>>,
72+
pub connect_service: Arc<services::connect::ConnectService>,
73+
pub announce_service: Arc<services::announce::AnnounceService>,
74+
pub scrape_service: Arc<services::scrape::ScrapeService>,
7575
}
7676

7777
impl UdpTrackerCoreServices {
@@ -94,12 +94,12 @@ impl UdpTrackerCoreServices {
9494

9595
Arc::new(Self {
9696
stats_keeper: keeper,
97-
udp_core_stats_event_sender,
98-
udp_core_stats_repository,
99-
udp_ban_service: ban_service,
100-
udp_connect_service: connect_service,
101-
udp_announce_service: announce_service,
102-
udp_scrape_service: scrape_service,
97+
stats_event_sender: udp_core_stats_event_sender,
98+
stats_repository: udp_core_stats_repository,
99+
ban_service,
100+
connect_service,
101+
announce_service,
102+
scrape_service,
103103
})
104104
}
105105
}

‎packages/udp-tracker-server/src/container.rs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ use torrust_tracker_configuration::Core;
55
use crate::{event, statistics};
66

77
pub struct UdpTrackerServerContainer {
8-
pub udp_server_stats_keeper: Arc<statistics::keeper::Keeper>,
9-
pub udp_server_stats_event_sender: Arc<Option<Box<dyn event::sender::Sender>>>,
10-
pub udp_server_stats_repository: Arc<statistics::repository::Repository>,
8+
pub stats_keeper: Arc<statistics::keeper::Keeper>,
9+
pub stats_event_sender: Arc<Option<Box<dyn event::sender::Sender>>>,
10+
pub stats_repository: Arc<statistics::repository::Repository>,
1111
}
1212

1313
impl UdpTrackerServerContainer {
@@ -16,17 +16,17 @@ impl UdpTrackerServerContainer {
1616
let udp_tracker_server_services = UdpTrackerServerServices::initialize(core_config);
1717

1818
Arc::new(Self {
19-
udp_server_stats_keeper: udp_tracker_server_services.udp_server_stats_keeper.clone(),
20-
udp_server_stats_event_sender: udp_tracker_server_services.udp_server_stats_event_sender.clone(),
21-
udp_server_stats_repository: udp_tracker_server_services.udp_server_stats_repository.clone(),
19+
stats_keeper: udp_tracker_server_services.stats_keeper.clone(),
20+
stats_event_sender: udp_tracker_server_services.stats_event_sender.clone(),
21+
stats_repository: udp_tracker_server_services.stats_repository.clone(),
2222
})
2323
}
2424
}
2525

2626
pub struct UdpTrackerServerServices {
27-
pub udp_server_stats_keeper: Arc<statistics::keeper::Keeper>,
28-
pub udp_server_stats_event_sender: Arc<Option<Box<dyn event::sender::Sender>>>,
29-
pub udp_server_stats_repository: Arc<statistics::repository::Repository>,
27+
pub stats_keeper: Arc<statistics::keeper::Keeper>,
28+
pub stats_event_sender: Arc<Option<Box<dyn event::sender::Sender>>>,
29+
pub stats_repository: Arc<statistics::repository::Repository>,
3030
}
3131

3232
impl UdpTrackerServerServices {
@@ -37,9 +37,9 @@ impl UdpTrackerServerServices {
3737
let udp_server_stats_repository = udp_server_stats_keeper.repository();
3838

3939
Arc::new(Self {
40-
udp_server_stats_keeper: udp_server_stats_keeper.clone(),
41-
udp_server_stats_event_sender: udp_server_stats_event_sender.clone(),
42-
udp_server_stats_repository: udp_server_stats_repository.clone(),
40+
stats_keeper: udp_server_stats_keeper.clone(),
41+
stats_event_sender: udp_server_stats_event_sender.clone(),
42+
stats_repository: udp_server_stats_repository.clone(),
4343
})
4444
}
4545
}

‎packages/udp-tracker-server/src/environment.rs‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,7 @@ impl Environment<Stopped> {
7575
let udp_core_event_listener_job = Some(self.container.udp_tracker_core_container.stats_keeper.run_event_listener());
7676

7777
// Start the UDP tracker server event listener
78-
let udp_server_event_listener_job = Some(
79-
self.container
80-
.udp_tracker_server_container
81-
.udp_server_stats_keeper
82-
.run_event_listener(),
83-
);
78+
let udp_server_event_listener_job = Some(self.container.udp_tracker_server_container.stats_keeper.run_event_listener());
8479

8580
// Start the UDP tracker server
8681
let server = self

‎packages/udp-tracker-server/src/handlers/mod.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ pub(crate) async fn handle_packet(
9898
udp_request.from,
9999
server_service_binding,
100100
request_id,
101-
&udp_tracker_server_container.udp_server_stats_event_sender,
101+
&udp_tracker_server_container.stats_event_sender,
102102
cookie_time_values.valid_range.clone(),
103103
&error,
104104
Some(transaction_id),
@@ -114,7 +114,7 @@ pub(crate) async fn handle_packet(
114114
udp_request.from,
115115
server_service_binding,
116116
request_id,
117-
&udp_tracker_server_container.udp_server_stats_event_sender,
117+
&udp_tracker_server_container.stats_event_sender,
118118
cookie_time_values.valid_range.clone(),
119119
&e,
120120
None,
@@ -161,7 +161,7 @@ pub async fn handle_request(
161161
server_service_binding,
162162
&connect_request,
163163
&udp_tracker_core_container.connect_service,
164-
&udp_tracker_server_container.udp_server_stats_event_sender,
164+
&udp_tracker_server_container.stats_event_sender,
165165
cookie_time_values.issue_time,
166166
)
167167
.await,
@@ -174,7 +174,7 @@ pub async fn handle_request(
174174
server_service_binding,
175175
&announce_request,
176176
&udp_tracker_core_container.tracker_core_container.core_config,
177-
&udp_tracker_server_container.udp_server_stats_event_sender,
177+
&udp_tracker_server_container.stats_event_sender,
178178
cookie_time_values.valid_range,
179179
)
180180
.await
@@ -189,7 +189,7 @@ pub async fn handle_request(
189189
client_socket_addr,
190190
server_service_binding,
191191
&scrape_request,
192-
&udp_tracker_server_container.udp_server_stats_event_sender,
192+
&udp_tracker_server_container.stats_event_sender,
193193
cookie_time_values.valid_range,
194194
)
195195
.await

‎packages/udp-tracker-server/src/server/launcher.rs‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,7 @@ impl Launcher {
182182

183183
let client_socket_addr = req.from;
184184

185-
if let Some(udp_server_stats_event_sender) = udp_tracker_server_container.udp_server_stats_event_sender.as_deref()
186-
{
185+
if let Some(udp_server_stats_event_sender) = udp_tracker_server_container.stats_event_sender.as_deref() {
187186
udp_server_stats_event_sender
188187
.send_event(Event::UdpRequestReceived {
189188
context: ConnectionContext::new(client_socket_addr, server_service_binding.clone()),
@@ -194,9 +193,7 @@ impl Launcher {
194193
if udp_tracker_core_container.ban_service.read().await.is_banned(&req.from.ip()) {
195194
tracing::debug!(target: UDP_TRACKER_LOG_TARGET, local_addr, "Udp::run_udp_server::loop continue: (banned ip)");
196195

197-
if let Some(udp_server_stats_event_sender) =
198-
udp_tracker_server_container.udp_server_stats_event_sender.as_deref()
199-
{
196+
if let Some(udp_server_stats_event_sender) = udp_tracker_server_container.stats_event_sender.as_deref() {
200197
udp_server_stats_event_sender
201198
.send_event(Event::UdpRequestBanned {
202199
context: ConnectionContext::new(client_socket_addr, server_service_binding.clone()),
@@ -236,9 +233,7 @@ impl Launcher {
236233
if old_request_aborted {
237234
// Evicted task from active requests buffer was aborted.
238235

239-
if let Some(udp_server_stats_event_sender) =
240-
udp_tracker_server_container.udp_server_stats_event_sender.as_deref()
241-
{
236+
if let Some(udp_server_stats_event_sender) = udp_tracker_server_container.stats_event_sender.as_deref() {
242237
udp_server_stats_event_sender
243238
.send_event(Event::UdpRequestAborted {
244239
context: ConnectionContext::new(client_socket_addr, server_service_binding),

‎packages/udp-tracker-server/src/server/processor.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ impl Processor {
115115
}
116116

117117
if let Some(udp_server_stats_event_sender) =
118-
self.udp_tracker_server_container.udp_server_stats_event_sender.as_deref()
118+
self.udp_tracker_server_container.stats_event_sender.as_deref()
119119
{
120120
udp_server_stats_event_sender
121121
.send_event(Event::UdpResponseSent {

‎packages/udp-tracker-server/tests/server/contract.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ mod receiving_an_announce_request {
268268
let udp_requests_banned_before = env
269269
.container
270270
.udp_tracker_server_container
271-
.udp_server_stats_repository
271+
.stats_repository
272272
.get_stats()
273273
.await
274274
.udp_requests_banned;
@@ -284,7 +284,7 @@ mod receiving_an_announce_request {
284284
let udp_requests_banned_after = env
285285
.container
286286
.udp_tracker_server_container
287-
.udp_server_stats_repository
287+
.stats_repository
288288
.get_stats()
289289
.await
290290
.udp_requests_banned;

‎src/app.rs‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,7 @@ async fn load_whitelisted_torrents(config: &Configuration, app_container: &Arc<A
111111

112112
fn start_http_core_event_listener(config: &Configuration, app_container: &Arc<AppContainer>) {
113113
if config.core.tracker_usage_statistics {
114-
let _job = app_container
115-
.http_tracker_core_services
116-
.http_stats_keeper
117-
.run_event_listener();
114+
let _job = app_container.http_tracker_core_services.stats_keeper.run_event_listener();
118115

119116
// todo: this cannot be enabled otherwise the application never ends
120117
// because the event listener never stops. You see this console message
@@ -148,10 +145,7 @@ fn start_udp_core_event_listener(config: &Configuration, app_container: &Arc<App
148145

149146
fn start_udp_server_event_listener(config: &Configuration, app_container: &Arc<AppContainer>) {
150147
if config.core.tracker_usage_statistics {
151-
let _job = app_container
152-
.udp_tracker_server_container
153-
.udp_server_stats_keeper
154-
.run_event_listener();
148+
let _job = app_container.udp_tracker_server_container.stats_keeper.run_event_listener();
155149

156150
// todo: this cannot be enabled otherwise the application never ends
157151
// because the event listener never stops. You see this console message

0 commit comments

Comments
 (0)