@@ -28,7 +28,7 @@ use super::packet::OnionMessageContents;
28
28
use super :: packet:: ParsedOnionMessageContents ;
29
29
use super :: offers:: OffersMessageHandler ;
30
30
use super :: packet:: { BIG_PACKET_HOP_DATA_LEN , ForwardControlTlvs , Packet , Payload , ReceiveControlTlvs , SMALL_PACKET_HOP_DATA_LEN } ;
31
- use crate :: util:: logger:: Logger ;
31
+ use crate :: util:: logger:: { Logger , WithContext } ;
32
32
use crate :: util:: ser:: Writeable ;
33
33
34
34
use core:: fmt;
@@ -753,7 +753,8 @@ where
753
753
} ,
754
754
Ok ( SendSuccess :: BufferedAwaitingConnection ( node_id) ) => {
755
755
log_trace ! (
756
- self . logger, "Buffered onion message waiting on peer connection {}: {}" ,
756
+ WithContext :: from( & self . logger, Some ( * node_id) , None ) ,
757
+ "Buffered onion message waiting on peer connection {}: {}" ,
757
758
log_suffix, node_id
758
759
) ;
759
760
} ,
@@ -912,12 +913,12 @@ where
912
913
OMH :: Target : OffersMessageHandler ,
913
914
CMH :: Target : CustomOnionMessageHandler ,
914
915
{
915
- fn handle_onion_message ( & self , _peer_node_id : & PublicKey , msg : & OnionMessage ) {
916
+ fn handle_onion_message ( & self , peer_node_id : & PublicKey , msg : & OnionMessage ) {
916
917
match self . peel_onion_message ( msg) {
917
918
Ok ( PeeledOnion :: Receive ( message, path_id, reply_path) ) => {
918
919
log_trace ! (
919
- self . logger,
920
- "Received an onion message with path_id {:02x?} and {} reply_path: {:?}" ,
920
+ WithContext :: from ( & self . logger, Some ( * peer_node_id ) , None ) ,
921
+ "Received an onion message with path_id {:02x?} and {} reply_path: {:?}" ,
921
922
path_id, if reply_path. is_some( ) { "a" } else { "no" } , message) ;
922
923
923
924
match message {
@@ -944,7 +945,10 @@ where
944
945
Ok ( PeeledOnion :: Forward ( next_node_id, onion_message) ) => {
945
946
let mut message_recipients = self . message_recipients . lock ( ) . unwrap ( ) ;
946
947
if outbound_buffer_full ( & next_node_id, & message_recipients) {
947
- log_trace ! ( self . logger, "Dropping forwarded onion message to peer {}: outbound buffer full" , next_node_id) ;
948
+ log_trace ! (
949
+ WithContext :: from( & self . logger, Some ( * peer_node_id) , None ) ,
950
+ "Dropping forwarded onion message to peer {}: outbound buffer full" ,
951
+ next_node_id) ;
948
952
return
949
953
}
950
954
@@ -958,16 +962,25 @@ where
958
962
e. get( ) , OnionMessageRecipient :: ConnectedPeer ( ..)
959
963
) => {
960
964
e. get_mut ( ) . enqueue_message ( onion_message) ;
961
- log_trace ! ( self . logger, "Forwarding an onion message to peer {}" , next_node_id) ;
965
+ log_trace ! (
966
+ WithContext :: from( & self . logger, Some ( * peer_node_id) , None ) ,
967
+ "Forwarding an onion message to peer {}" ,
968
+ next_node_id) ;
962
969
} ,
963
970
_ => {
964
- log_trace ! ( self . logger, "Dropping forwarded onion message to disconnected peer {}" , next_node_id) ;
971
+ log_trace ! (
972
+ WithContext :: from( & self . logger, Some ( * peer_node_id) , None ) ,
973
+ "Dropping forwarded onion message to disconnected peer {}" ,
974
+ next_node_id) ;
965
975
return
966
976
} ,
967
977
}
968
978
} ,
969
979
Err ( e) => {
970
- log_error ! ( self . logger, "Failed to process onion message {:?}" , e) ;
980
+ log_error ! (
981
+ WithContext :: from( & self . logger, Some ( * peer_node_id) , None ) ,
982
+ "Failed to process onion message {:?}" ,
983
+ e) ;
971
984
}
972
985
}
973
986
}
0 commit comments