Skip to content

Commit 8fe4cf8

Browse files
committed
Use structured logging where appropriate in OnionMessenger
1 parent c633468 commit 8fe4cf8

File tree

1 file changed

+22
-9
lines changed

1 file changed

+22
-9
lines changed

lightning/src/onion_message/messenger.rs

+22-9
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ use super::packet::OnionMessageContents;
2828
use super::packet::ParsedOnionMessageContents;
2929
use super::offers::OffersMessageHandler;
3030
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};
3232
use crate::util::ser::Writeable;
3333

3434
use core::fmt;
@@ -753,7 +753,8 @@ where
753753
},
754754
Ok(SendSuccess::BufferedAwaitingConnection(node_id)) => {
755755
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 {}: {}",
757758
log_suffix, node_id
758759
);
759760
},
@@ -912,12 +913,12 @@ where
912913
OMH::Target: OffersMessageHandler,
913914
CMH::Target: CustomOnionMessageHandler,
914915
{
915-
fn handle_onion_message(&self, _peer_node_id: &PublicKey, msg: &OnionMessage) {
916+
fn handle_onion_message(&self, peer_node_id: &PublicKey, msg: &OnionMessage) {
916917
match self.peel_onion_message(msg) {
917918
Ok(PeeledOnion::Receive(message, path_id, reply_path)) => {
918919
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: {:?}",
921922
path_id, if reply_path.is_some() { "a" } else { "no" }, message);
922923

923924
match message {
@@ -944,7 +945,10 @@ where
944945
Ok(PeeledOnion::Forward(next_node_id, onion_message)) => {
945946
let mut message_recipients = self.message_recipients.lock().unwrap();
946947
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);
948952
return
949953
}
950954

@@ -958,16 +962,25 @@ where
958962
e.get(), OnionMessageRecipient::ConnectedPeer(..)
959963
) => {
960964
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);
962969
},
963970
_ => {
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);
965975
return
966976
},
967977
}
968978
},
969979
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);
971984
}
972985
}
973986
}

0 commit comments

Comments
 (0)