Only log_gossip for talkative types. Revert for SendErrorMessage.

Author: Elias Rohrer

lightning/src/ln/peer_handler.rs

@@ -24,6 +24,7 @@ use ln::channelmanager::{SimpleArcChannelManager, SimpleRefChannelManager};
 use util::ser::{VecWriter, Writeable, Writer};
 use ln::peer_channel_encryptor::{PeerChannelEncryptor,NextNoiseStep};
 use ln::wire;
+use ln::wire::Encode;
 use util::atomic_counter::AtomicCounter;
 use util::events::{MessageSendEvent, MessageSendEventsProvider};
 use util::logger::Logger;
@@ -757,7 +758,19 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, L: Deref, CMH: Deref> P
 	fn enqueue_message<M: wire::Type>(&self, peer: &mut Peer, message: &M) {
 		let mut buffer = VecWriter(Vec::with_capacity(2048));
 		wire::write(message, &mut buffer).unwrap(); // crash if the write failed
-		log_trace!(self.logger, "Enqueueing message {:?} to {}", message, log_pubkey!(peer.their_node_id.unwrap()));
+
+		match message.type_id() {
+			msgs::Ping::TYPE |
+			msgs::Pong::TYPE |
+			msgs::ChannelAnnouncement::TYPE |
+			msgs::NodeAnnouncement::TYPE |
+			msgs::QueryShortChannelIds::TYPE |
+			msgs::ReplyShortChannelIdsEnd::TYPE |
+			msgs::QueryChannelRange::TYPE |
+			msgs::ReplyChannelRange::TYPE |
+			msgs::GossipTimestampFilter::TYPE => log_gossip!(self.logger, "Enqueueing message {:?} to {}", message, log_pubkey!(peer.their_node_id.unwrap())),
+			_ => log_trace!(self.logger, "Enqueueing message {:?} to {}", message, log_pubkey!(peer.their_node_id.unwrap()))
+		};
 		self.enqueue_encoded_message(peer, &buffer.0);
 	}
 
@@ -953,7 +966,19 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, L: Deref, CMH: Deref> P
 		peer: &mut Peer,
 		message: wire::Message<<<CMH as core::ops::Deref>::Target as wire::CustomMessageReader>::CustomMessage>
 	) -> Result<Option<wire::Message<<<CMH as core::ops::Deref>::Target as wire::CustomMessageReader>::CustomMessage>>, MessageHandlingError> {
-		log_gossip!(self.logger, "Received message {:?} from {}", message, log_pubkey!(peer.their_node_id.unwrap()));
+		match message {
+			wire::Message::Ping(_) |
+			wire::Message::Pong(_) |
+			wire::Message::ChannelAnnouncement(_) |
+			wire::Message::NodeAnnouncement(_) |
+			wire::Message::QueryShortChannelIds(_) |
+			wire::Message::ReplyShortChannelIdsEnd(_) |
+			wire::Message::QueryChannelRange(_) |
+			wire::Message::ReplyChannelRange(_) |
+			wire::Message::GossipTimestampFilter(_) => log_gossip!(self.logger, "Received message {:?} from {}", message, log_pubkey!(peer.their_node_id.unwrap())),
+			_ => log_trace!(self.logger, "Received message {:?} from {}", message, log_pubkey!(peer.their_node_id.unwrap()))
+		};
+
 		peer.received_message_since_timer_tick = true;
 
 		// Need an Init as first message
@@ -1391,7 +1416,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, L: Deref, CMH: Deref> P
 								log_debug!(self.logger, "Received a HandleError event to be ignored for node {}", log_pubkey!(node_id));
 							},
 							msgs::ErrorAction::SendErrorMessage { ref msg } => {
-								log_gossip!(self.logger, "Handling SendErrorMessage HandleError event in peer_handler for node {} with message {}",
+								log_trace!(self.logger, "Handling SendErrorMessage HandleError event in peer_handler for node {} with message {}",
 										log_pubkey!(node_id),
 										msg.data);
 								self.enqueue_message(get_peer_for_forwarding!(node_id), msg);