projects
/
rust-lightning
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a873398
)
Log peer public key more thoroughly when logging in peer_handler
author
Matt Corallo
<git@bluematt.me>
Wed, 27 Oct 2021 20:06:13 +0000
(20:06 +0000)
committer
Matt Corallo
<git@bluematt.me>
Thu, 28 Oct 2021 18:26:10 +0000
(18:26 +0000)
lightning/src/ln/peer_handler.rs
patch
|
blob
|
history
diff --git
a/lightning/src/ln/peer_handler.rs
b/lightning/src/ln/peer_handler.rs
index afc7f1438e897dc4feb5bf0865f51ef30034da1a..2095f0519968396bb9cbb0fd6928b5fb84729cc6 100644
(file)
--- a/
lightning/src/ln/peer_handler.rs
+++ b/
lightning/src/ln/peer_handler.rs
@@
-493,6
+493,13
@@
impl<Descriptor: SocketDescriptor, RM: Deref, L: Deref> PeerManager<Descriptor,
}
}
}
}
+struct OptionalFromDebugger<'a>(&'a Option<PublicKey>);
+impl core::fmt::Display for OptionalFromDebugger<'_> {
+ fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> Result<(), core::fmt::Error> {
+ if let Some(node_id) = self.0 { write!(f, " from {}", log_pubkey!(node_id)) } else { Ok(()) }
+ }
+}
+
impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, L: Deref, CMH: Deref> PeerManager<Descriptor, CM, RM, L, CMH> where
CM::Target: ChannelMessageHandler,
RM::Target: RoutingMessageHandler,
impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, L: Deref, CMH: Deref> PeerManager<Descriptor, CM, RM, L, CMH> where
CM::Target: ChannelMessageHandler,
RM::Target: RoutingMessageHandler,
@@
-804,19
+811,19
@@
impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, L: Deref, CMH: Deref> P
match e.action {
msgs::ErrorAction::DisconnectPeer { msg: _ } => {
//TODO: Try to push msg
match e.action {
msgs::ErrorAction::DisconnectPeer { msg: _ } => {
//TODO: Try to push msg
- log_debug!(self.logger, "Error handling message
; disconnecting peer with: {}"
, e.err);
+ log_debug!(self.logger, "Error handling message
{}; disconnecting peer with: {}", OptionalFromDebugger(&peer.their_node_id)
, e.err);
return Err(PeerHandleError{ no_connection_possible: false });
},
msgs::ErrorAction::IgnoreAndLog(level) => {
return Err(PeerHandleError{ no_connection_possible: false });
},
msgs::ErrorAction::IgnoreAndLog(level) => {
- log_given_level!(self.logger, level, "Error handling message
; ignoring: {}"
, e.err);
+ log_given_level!(self.logger, level, "Error handling message
{}; ignoring: {}", OptionalFromDebugger(&peer.their_node_id)
, e.err);
continue
},
msgs::ErrorAction::IgnoreError => {
continue
},
msgs::ErrorAction::IgnoreError => {
- log_debug!(self.logger, "Error handling message
; ignoring: {}"
, e.err);
+ log_debug!(self.logger, "Error handling message
{}; ignoring: {}", OptionalFromDebugger(&peer.their_node_id)
, e.err);
continue;
},
msgs::ErrorAction::SendErrorMessage { msg } => {
continue;
},
msgs::ErrorAction::SendErrorMessage { msg } => {
- log_debug!(self.logger, "Error handling message
; sending error message with: {}"
, e.err);
+ log_debug!(self.logger, "Error handling message
{}; sending error message with: {}", OptionalFromDebugger(&peer.their_node_id)
, e.err);
self.enqueue_message(peer, &msg);
continue;
},
self.enqueue_message(peer, &msg);
continue;
},
@@
-982,7
+989,7
@@
impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, L: Deref, CMH: Deref> P
return Err(PeerHandleError{ no_connection_possible: false }.into());
}
return Err(PeerHandleError{ no_connection_possible: false }.into());
}
- log_info!(self.logger, "Received peer Init message
: {}"
, msg.features);
+ log_info!(self.logger, "Received peer Init message
from {}: {}", log_pubkey!(peer.their_node_id.unwrap())
, msg.features);
if msg.features.initial_routing_sync() {
peer.sync_status = InitSyncTracker::ChannelsSyncing(0);
if msg.features.initial_routing_sync() {
peer.sync_status = InitSyncTracker::ChannelsSyncing(0);