From b030e84ad8f9eeb678fa52fa3b589f9e937a46ec Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Fri, 2 Nov 2018 10:45:29 -0400
Subject: [PATCH] Add logging for (dis)connect in peer_handler/channelmanager

---
 src/ln/channelmanager.rs | 4 ++++
 src/ln/peer_handler.rs   | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/ln/channelmanager.rs b/src/ln/channelmanager.rs
index ed69e8a0..51bf2704 100644
--- a/src/ln/channelmanager.rs
+++ b/src/ln/channelmanager.rs
@@ -2703,6 +2703,7 @@ impl ChannelMessageHandler for ChannelManager {
 			let short_to_id = channel_state.short_to_id;
 			let pending_msg_events = channel_state.pending_msg_events;
 			if no_connection_possible {
+				log_debug!(self, "Failing all channels with {} due to no_connection_possible", log_pubkey!(their_node_id));
 				channel_state.by_id.retain(|_, chan| {
 					if chan.get_their_node_id() == *their_node_id {
 						if let Some(short_id) = chan.get_short_channel_id() {
@@ -2720,6 +2721,7 @@ impl ChannelMessageHandler for ChannelManager {
 					}
 				});
 			} else {
+				log_debug!(self, "Marking channels with {} disconnected and generating channel_updates", log_pubkey!(their_node_id));
 				channel_state.by_id.retain(|_, chan| {
 					if chan.get_their_node_id() == *their_node_id {
 						//TODO: mark channel disabled (and maybe announce such after a timeout).
@@ -2750,6 +2752,8 @@ impl ChannelMessageHandler for ChannelManager {
 	}
 
 	fn peer_connected(&self, their_node_id: &PublicKey) {
+		log_debug!(self, "Generating channel_reestablish events for {}", log_pubkey!(their_node_id));
+
 		let _ = self.total_consistency_lock.read().unwrap();
 		let mut channel_state_lock = self.channel_state.lock().unwrap();
 		let channel_state = channel_state_lock.borrow_parts();
diff --git a/src/ln/peer_handler.rs b/src/ln/peer_handler.rs
index d868b075..5d13df95 100644
--- a/src/ln/peer_handler.rs
+++ b/src/ln/peer_handler.rs
@@ -417,10 +417,14 @@ impl<Descriptor: SocketDescriptor> PeerManager<Descriptor> {
 								() => {
 									match peers.node_id_to_descriptor.entry(peer.their_node_id.unwrap()) {
 										hash_map::Entry::Occupied(_) => {
+											log_trace!(self, "Got second connection with {}, closing", log_pubkey!(peer.their_node_id.unwrap()));
 											peer.their_node_id = None; // Unset so that we don't generate a peer_disconnected event
 											return Err(PeerHandleError{ no_connection_possible: false })
 										},
-										hash_map::Entry::Vacant(entry) => entry.insert(peer_descriptor.clone()),
+										hash_map::Entry::Vacant(entry) => {
+											log_trace!(self, "Finished noise handshake for connection with {}", log_pubkey!(peer.their_node_id.unwrap()));
+											entry.insert(peer_descriptor.clone())
+										},
 									};
 								}
 							}
@@ -477,6 +481,7 @@ impl<Descriptor: SocketDescriptor> PeerManager<Descriptor> {
 										log_trace!(self, "Received message of type {} from {}", msg_type, log_pubkey!(peer.their_node_id.unwrap()));
 										if msg_type != 16 && peer.their_global_features.is_none() {
 											// Need an init message as first message
+											log_trace!(self, "Peer {} sent non-Init first message", log_pubkey!(peer.their_node_id.unwrap()));
 											return Err(PeerHandleError{ no_connection_possible: false });
 										}
 										let mut reader = ::std::io::Cursor::new(&msg_data[2..]);
-- 
2.30.2