f Drop log_given_level macro

Author: tnull

lightning-rapid-gossip-sync/src/processing.rs

@@ -13,7 +13,7 @@ use lightning::ln::msgs::{
 use lightning::routing::gossip::{NetworkGraph, NodeAlias, NodeId};
 use lightning::util::logger::Logger;
 use lightning::util::ser::{BigSize, FixedLengthReader, Readable};
-use lightning::{log_debug, log_given_level, log_gossip, log_trace, log_warn};
+use lightning::{log_debug, log_gossip, log_internal, log_trace, log_warn};
 
 use crate::{GraphSyncError, RapidGossipSync};
 
@@ -305,7 +305,7 @@ where
 				Ok(_) => {},
 				Err(LightningError { action: ErrorAction::IgnoreDuplicateGossip, .. }) => {},
 				Err(LightningError { action: ErrorAction::IgnoreAndLog(level), err }) => {
-					log_given_level!(
+					log_internal!(
 						self.logger,
 						level,
 						"Failed to apply node announcement: {:?}",
@@ -444,12 +444,7 @@ where
 				Ok(_) => {},
 				Err(LightningError { action: ErrorAction::IgnoreDuplicateGossip, .. }) => {},
 				Err(LightningError { action: ErrorAction::IgnoreAndLog(level), err }) => {
-					log_given_level!(
-						self.logger,
-						level,
-						"Failed to apply channel update: {:?}",
-						err
-					);
+					log_internal!(self.logger, level, "Failed to apply channel update: {:?}", err);
 				},
 				Err(LightningError { action: ErrorAction::IgnoreError, .. }) => {},
 				Err(e) => return Err(e.into()),

lightning/src/ln/peer_handler.rs

@@ -1411,7 +1411,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 											return Err(PeerHandleError { });
 										},
 										msgs::ErrorAction::IgnoreAndLog(level) => {
-											log_given_level!(logger, level, "Error handling {}message{}; ignoring: {}",
+											log_internal!(logger, level, "Error handling {}message{}; ignoring: {}",
 												if level == Level::Gossip { "gossip " } else { "" },
 												OptionalFromDebugger(&peer_node_id), e.err);
 											continue
@@ -1427,7 +1427,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 											continue;
 										},
 										msgs::ErrorAction::SendWarningMessage { msg, log_level } => {
-											log_given_level!(logger, log_level, "Error handling message{}; sending warning message with: {}", OptionalFromDebugger(&peer_node_id), e.err);
+											log_internal!(logger, log_level, "Error handling message{}; sending warning message with: {}", OptionalFromDebugger(&peer_node_id), e.err);
 											self.enqueue_message($peer, &msg);
 											continue;
 										},
@@ -2385,7 +2385,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 									peers_to_disconnect.insert(node_id, Some(wire::Message::Warning(msg)));
 								},
 								msgs::ErrorAction::IgnoreAndLog(level) => {
-									log_given_level!(logger, level, "Received a HandleError event to be ignored for node {}", log_pubkey!(node_id));
+									log_internal!(logger, level, "Received a HandleError event to be ignored for node {}", log_pubkey!(node_id));
 								},
 								msgs::ErrorAction::IgnoreDuplicateGossip => {},
 								msgs::ErrorAction::IgnoreError => {
@@ -2398,7 +2398,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 									self.enqueue_message(&mut *get_peer_for_forwarding!(&node_id)?, msg);
 								},
 								msgs::ErrorAction::SendWarningMessage { ref msg, ref log_level } => {
-									log_given_level!(logger, *log_level, "Handling SendWarningMessage HandleError event in peer_handler for node {} with message {}",
+									log_internal!(logger, *log_level, "Handling SendWarningMessage HandleError event in peer_handler for node {} with message {}",
 											log_pubkey!(node_id),
 											msg.data);
 									self.enqueue_message(&mut *get_peer_for_forwarding!(&node_id)?, msg);

lightning/src/util/macro_logger.rs

@@ -179,66 +179,50 @@ macro_rules! log_internal {
 	);
 }
 
-/// Logs an entry at the given level.
-#[doc(hidden)]
-#[macro_export]
-macro_rules! log_given_level {
-	($logger: expr, $lvl:expr, $($arg:tt)+) => (
-		match $lvl {
-			$crate::util::logger::Level::Error => $crate::log_internal!($logger, $lvl, $($arg)*),
-			$crate::util::logger::Level::Warn => $crate::log_internal!($logger, $lvl, $($arg)*),
-			$crate::util::logger::Level::Info => $crate::log_internal!($logger, $lvl, $($arg)*),
-			$crate::util::logger::Level::Debug => $crate::log_internal!($logger, $lvl, $($arg)*),
-			$crate::util::logger::Level::Trace => $crate::log_internal!($logger, $lvl, $($arg)*),
-			$crate::util::logger::Level::Gossip => $crate::log_internal!($logger, $lvl, $($arg)*),
-		}
-	);
-}
-
 /// Log at the `ERROR` level.
 #[macro_export]
 macro_rules! log_error {
 	($logger: expr, $($arg:tt)*) => (
-		$crate::log_given_level!($logger, $crate::util::logger::Level::Error, $($arg)*);
+		$crate::log_internal!($logger, $crate::util::logger::Level::Error, $($arg)*);
 	)
 }
 
 /// Log at the `WARN` level.
 #[macro_export]
 macro_rules! log_warn {
 	($logger: expr, $($arg:tt)*) => (
-		$crate::log_given_level!($logger, $crate::util::logger::Level::Warn, $($arg)*);
+		$crate::log_internal!($logger, $crate::util::logger::Level::Warn, $($arg)*);
 	)
 }
 
 /// Log at the `INFO` level.
 #[macro_export]
 macro_rules! log_info {
 	($logger: expr, $($arg:tt)*) => (
-		$crate::log_given_level!($logger, $crate::util::logger::Level::Info, $($arg)*);
+		$crate::log_internal!($logger, $crate::util::logger::Level::Info, $($arg)*);
 	)
 }
 
 /// Log at the `DEBUG` level.
 #[macro_export]
 macro_rules! log_debug {
 	($logger: expr, $($arg:tt)*) => (
-		$crate::log_given_level!($logger, $crate::util::logger::Level::Debug, $($arg)*);
+		$crate::log_internal!($logger, $crate::util::logger::Level::Debug, $($arg)*);
 	)
 }
 
 /// Log at the `TRACE` level.
 #[macro_export]
 macro_rules! log_trace {
 	($logger: expr, $($arg:tt)*) => (
-		$crate::log_given_level!($logger, $crate::util::logger::Level::Trace, $($arg)*)
+		$crate::log_internal!($logger, $crate::util::logger::Level::Trace, $($arg)*)
 	)
 }
 
 /// Log at the `GOSSIP` level.
 #[macro_export]
 macro_rules! log_gossip {
 	($logger: expr, $($arg:tt)*) => (
-		$crate::log_given_level!($logger, $crate::util::logger::Level::Gossip, $($arg)*);
+		$crate::log_internal!($logger, $crate::util::logger::Level::Gossip, $($arg)*);
 	)
 }