Skip to content

Commit b6ed3f3

Browse files
committed
Merge #1483: Overhaul stats: Extract events package (part 2)
540520c chore: remove unneded explicit pkg inclusion in workspace (Jose Celano) e434e10 refactor: [#1480] use the new events crate in udp-tracker-server pkg (Jose Celano) efed46c refactor: [#1480] use the new events crate in udp-tracker-core pkg (Jose Celano) 29b00c8 refactor: [#1480] use the new events crate in http-tracker-core pkg (Jose Celano) 934d45e feat: [#1480] add generic EventBus to events package (Jose Celano) 5ae485d feat: [#1480] add event sender based on tokio broadcast channel (Jose Celano) ff9d1f0 feat: [#1480] add event sender trait (Jose Celano) 05bfd65 fet: [#1480] new events pacakge (Jose Celano) Pull request description: Extract the new `events` package. ### Subtasks - [x] Create a new workspace package `events`. - [x] Move the code from `packages/http-tracker-core/src/event` and make it generic. - [x] Use the new generic event types in the packages: - [x] `http-tracker-core` - [x] `udp-tracker-core` - [x] `udp-tracker-server` ACKs for top commit: josecelano: ACK 540520c Tree-SHA512: d02c4f160a710fee5f5378b613929f38b4738b27e9f1075ff48dad9ebd2f1914d71bea85c1d9d436b9d730f69a1c5c55b3b97826683e5523dfcff47696b5ad5b
2 parents b211854 + 540520c commit b6ed3f3

File tree

38 files changed

+910
-337
lines changed

38 files changed

+910
-337
lines changed

.github/workflows/deployment.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ jobs:
7373
cargo publish -p torrust-tracker-clock
7474
cargo publish -p torrust-tracker-configuration
7575
cargo publish -p torrust-tracker-contrib-bencode
76+
cargo publish -p torrust-tracker-events
7677
cargo publish -p torrust-tracker-located-error
7778
cargo publish -p torrust-tracker-metrics
7879
cargo publish -p torrust-tracker-primitives

Cargo.lock

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/axum-http-tracker-server/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ serde_bencode = "0"
4545
serde_bytes = "0"
4646
serde_repr = "0"
4747
torrust-tracker-clock = { version = "3.0.0-develop", path = "../clock" }
48+
torrust-tracker-events = { version = "3.0.0-develop", path = "../events" }
4849
torrust-tracker-test-helpers = { version = "3.0.0-develop", path = "../test-helpers" }
4950
uuid = { version = "1", features = ["v4"] }
5051
zerocopy = "0.7"

packages/axum-http-tracker-server/src/v1/handlers/scrape.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ mod tests {
107107
}
108108

109109
struct CoreHttpTrackerServices {
110-
pub http_stats_event_sender: Arc<Option<Box<dyn bittorrent_http_tracker_core::event::sender::Sender>>>,
110+
pub http_stats_event_sender: bittorrent_http_tracker_core::event::sender::Sender,
111111
}
112112

113113
fn initialize_private_tracker() -> (CoreTrackerServices, CoreHttpTrackerServices) {

packages/events/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
./.coverage

packages/events/Cargo.toml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
[package]
2+
description = "A library with functionality to handle events in Torrust tracker packages."
3+
keywords = ["events", "library", "rust", "torrust", "tracker"]
4+
name = "torrust-tracker-events"
5+
readme = "README.md"
6+
7+
authors.workspace = true
8+
documentation.workspace = true
9+
edition.workspace = true
10+
homepage.workspace = true
11+
license.workspace = true
12+
publish.workspace = true
13+
repository.workspace = true
14+
rust-version.workspace = true
15+
version.workspace = true
16+
17+
[dependencies]
18+
futures = "0"
19+
tokio = { version = "1", features = ["macros", "net", "rt-multi-thread", "signal", "sync"] }
20+
21+
[dev-dependencies]
22+
mockall = "0"

0 commit comments

Comments
 (0)