Skip to content

Commit 8f4bd19

Browse files
authored
Merge pull request #2209 from TheBlueMatt/2023-04-better-discon-err-msg
Clarify the error message when we disconnect a peer
2 parents c89fd38 + 49a3662 commit 8f4bd19

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

lightning/src/ln/peer_handler.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1056,7 +1056,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
10561056
match self.do_read_event(peer_descriptor, data) {
10571057
Ok(res) => Ok(res),
10581058
Err(e) => {
1059-
log_trace!(self.logger, "Peer sent invalid data or we decided to disconnect due to a protocol error");
1059+
log_trace!(self.logger, "Disconnecting peer due to a protocol error (usually a duplicate connection).");
10601060
self.disconnect_event_internal(peer_descriptor);
10611061
Err(e)
10621062
}
@@ -2103,7 +2103,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
21032103
if let Some((node_id, _)) = peer.their_node_id {
21042104
self.node_id_to_descriptor.lock().unwrap().remove(&node_id);
21052105
}
2106-
self.do_disconnect(descriptor, &*peer, "ping timeout");
2106+
self.do_disconnect(descriptor, &*peer, "ping/handshake timeout");
21072107
}
21082108
}
21092109
}

0 commit comments

Comments
 (0)