@@ -614,13 +614,13 @@ where
614
614
// This message has already been seen. We don't re-publish messages that have already
615
615
// been published on the network.
616
616
tracing:: warn!(
617
- message =%msg_id,
617
+ message_id =%msg_id,
618
618
"Not publishing a message that has already been published"
619
619
) ;
620
620
return Err ( PublishError :: Duplicate ) ;
621
621
}
622
622
623
- tracing:: trace!( message =%msg_id, "Publishing message" ) ;
623
+ tracing:: trace!( message_id =%msg_id, "Publishing message" ) ;
624
624
625
625
let topic_hash = raw_message. topic . clone ( ) ;
626
626
@@ -773,7 +773,7 @@ where
773
773
self . send_idontwant ( & raw_message, & msg_id, raw_message. source . as_ref ( ) ) ;
774
774
}
775
775
776
- tracing:: debug!( message =%msg_id, "Published message" ) ;
776
+ tracing:: debug!( message_id =%msg_id, "Published message" ) ;
777
777
778
778
if let Some ( metrics) = self . metrics . as_mut ( ) {
779
779
metrics. register_published_message ( & topic_hash) ;
@@ -815,7 +815,7 @@ where
815
815
}
816
816
None => {
817
817
tracing:: warn!(
818
- message =%msg_id,
818
+ message_id =%msg_id,
819
819
"Message not in cache. Ignoring forwarding"
820
820
) ;
821
821
if let Some ( metrics) = self . metrics . as_mut ( ) {
@@ -861,7 +861,7 @@ where
861
861
}
862
862
true
863
863
} else {
864
- tracing:: warn!( message =%msg_id, "Rejected message not in cache" ) ;
864
+ tracing:: warn!( message_id =%msg_id, "Rejected message not in cache" ) ;
865
865
false
866
866
}
867
867
}
@@ -1344,13 +1344,13 @@ where
1344
1344
if count > self . config . gossip_retransimission ( ) {
1345
1345
tracing:: debug!(
1346
1346
peer=%peer_id,
1347
- message =%id,
1347
+ message_id =%id,
1348
1348
"IWANT: Peer has asked for message too many times; ignoring request"
1349
1349
) ;
1350
1350
} else {
1351
1351
if let Some ( peer) = self . connected_peers . get_mut ( peer_id) {
1352
1352
if peer. dont_send . contains_key ( & id) {
1353
- tracing:: debug!( %peer_id, message =%id, "Peer already sent IDONTWANT for this message" ) ;
1353
+ tracing:: debug!( %peer_id, message_id =%id, "Peer already sent IDONTWANT for this message" ) ;
1354
1354
continue ;
1355
1355
}
1356
1356
}
@@ -1662,7 +1662,7 @@ where
1662
1662
) -> bool {
1663
1663
tracing:: debug!(
1664
1664
peer=%propagation_source,
1665
- message =%msg_id,
1665
+ message_id =%msg_id,
1666
1666
"Handling message from peer"
1667
1667
) ;
1668
1668
@@ -1721,7 +1721,7 @@ where
1721
1721
1722
1722
if self_published {
1723
1723
tracing:: debug!(
1724
- message =%msg_id,
1724
+ message_id =%msg_id,
1725
1725
source=%propagation_source,
1726
1726
"Dropping message claiming to be from self but forwarded from source"
1727
1727
) ;
@@ -1782,7 +1782,7 @@ where
1782
1782
}
1783
1783
1784
1784
if !self . duplicate_cache . insert ( msg_id. clone ( ) ) {
1785
- tracing:: debug!( message =%msg_id, "Message already received, ignoring" ) ;
1785
+ tracing:: debug!( message_id =%msg_id, "Message already received, ignoring" ) ;
1786
1786
if let Some ( ( peer_score, ..) ) = & mut self . peer_score {
1787
1787
peer_score. duplicated_message ( propagation_source, & msg_id, & message. topic ) ;
1788
1788
}
@@ -1791,7 +1791,7 @@ where
1791
1791
}
1792
1792
1793
1793
tracing:: debug!(
1794
- message =%msg_id,
1794
+ message_id =%msg_id,
1795
1795
"Put message in duplicate_cache and resolve promises"
1796
1796
) ;
1797
1797
@@ -1837,7 +1837,7 @@ where
1837
1837
Some ( propagation_source) ,
1838
1838
HashSet :: new ( ) ,
1839
1839
) ;
1840
- tracing:: debug!( message =%msg_id, "Completed message handling for message" ) ;
1840
+ tracing:: debug!( message_id =%msg_id, "Completed message handling for message" ) ;
1841
1841
}
1842
1842
}
1843
1843
@@ -2672,7 +2672,7 @@ where
2672
2672
}
2673
2673
}
2674
2674
2675
- tracing:: debug!( message =%msg_id, "Forwarding message" ) ;
2675
+ tracing:: debug!( message_id =%msg_id, "Forwarding message" ) ;
2676
2676
let mut recipient_peers = HashSet :: new ( ) ;
2677
2677
2678
2678
// Populate the recipient peers mapping
@@ -2715,11 +2715,11 @@ where
2715
2715
for peer_id in recipient_peers. iter ( ) {
2716
2716
if let Some ( peer) = self . connected_peers . get_mut ( peer_id) {
2717
2717
if peer. dont_send . contains_key ( msg_id) {
2718
- tracing:: debug!( %peer_id, message =%msg_id, "Peer doesn't want message" ) ;
2718
+ tracing:: debug!( %peer_id, message_id =%msg_id, "Peer doesn't want message" ) ;
2719
2719
continue ;
2720
2720
}
2721
2721
2722
- tracing:: debug!( %peer_id, message =%msg_id, "Sending message to peer" ) ;
2722
+ tracing:: debug!( %peer_id, message_id =%msg_id, "Sending message to peer" ) ;
2723
2723
2724
2724
self . send_message (
2725
2725
* peer_id,
0 commit comments