Skip to content

Commit 60c00e8

Browse files
committed
feat: [#1358] add info-hash to all torrent-repository events
To know which swarm the event belongs to.
1 parent c706a1b commit 60c00e8

File tree

6 files changed

+104
-62
lines changed

6 files changed

+104
-62
lines changed

packages/torrent-repository/src/event.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,20 @@ pub enum Event {
1111
info_hash: InfoHash,
1212
},
1313
PeerAdded {
14+
info_hash: InfoHash,
1415
peer: Peer,
1516
},
1617
PeerRemoved {
18+
info_hash: InfoHash,
1719
peer: Peer,
1820
},
1921
PeerUpdated {
22+
info_hash: InfoHash,
2023
old_peer: Peer,
2124
new_peer: Peer,
2225
},
2326
PeerDownloadCompleted {
27+
info_hash: InfoHash,
2428
peer: Peer,
2529
},
2630
}

packages/torrent-repository/src/statistics/event/handler.rs

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,26 @@ pub async fn handle_event(event: Event, stats_repository: &Arc<Repository>, now:
2727
.decrement_gauge(&metric_name!(TORRENT_REPOSITORY_TORRENTS_TOTAL), &LabelSet::default(), now)
2828
.await;
2929
}
30-
Event::PeerAdded { peer } => {
31-
tracing::debug!(peer = ?peer, "Peer added", );
30+
Event::PeerAdded { info_hash, peer } => {
31+
tracing::debug!(info_hash = ?info_hash, peer = ?peer, "Peer added", );
3232

3333
let _unused = stats_repository
3434
.increment_gauge(&metric_name!(TORRENT_REPOSITORY_PEERS_TOTAL), &label_set_for_peer(&peer), now)
3535
.await;
3636
}
37-
Event::PeerRemoved { peer } => {
38-
tracing::debug!(peer = ?peer, "Peer removed", );
37+
Event::PeerRemoved { info_hash, peer } => {
38+
tracing::debug!(info_hash = ?info_hash, peer = ?peer, "Peer removed", );
3939

4040
let _unused = stats_repository
4141
.decrement_gauge(&metric_name!(TORRENT_REPOSITORY_PEERS_TOTAL), &label_set_for_peer(&peer), now)
4242
.await;
4343
}
44-
Event::PeerUpdated { old_peer, new_peer } => {
45-
tracing::debug!(old_peer = ?old_peer, new_peer = ?new_peer, "Peer updated", );
44+
Event::PeerUpdated {
45+
info_hash,
46+
old_peer,
47+
new_peer,
48+
} => {
49+
tracing::debug!(info_hash = ?info_hash, old_peer = ?old_peer, new_peer = ?new_peer, "Peer updated", );
4650

4751
if old_peer.role() != new_peer.role() {
4852
let _unused = stats_repository
@@ -62,8 +66,8 @@ pub async fn handle_event(event: Event, stats_repository: &Arc<Repository>, now:
6266
.await;
6367
}
6468
}
65-
Event::PeerDownloadCompleted { peer } => {
66-
tracing::debug!(peer = ?peer, "Peer download completed", );
69+
Event::PeerDownloadCompleted { info_hash, peer } => {
70+
tracing::debug!(info_hash = ?info_hash, peer = ?peer, "Peer download completed", );
6771

6872
let _unused = stats_repository
6973
.increment_counter(

0 commit comments

Comments
 (0)