Skip to content

Commit c0ee016

Browse files
tnulltnull
committed
f Drop log_given_level macro
1 parent 5e9589f commit c0ee016

File tree

3 files changed

+13
-34
lines changed

3 files changed

+13
-34
lines changed

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

+3-8
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use lightning::ln::msgs::{
1313
use lightning::routing::gossip::{NetworkGraph, NodeAlias, NodeId};
1414
use lightning::util::logger::Logger;
1515
use lightning::util::ser::{BigSize, FixedLengthReader, Readable};
16-
use lightning::{log_debug, log_given_level, log_gossip, log_trace, log_warn};
16+
use lightning::{log_debug, log_gossip, log_internal, log_trace, log_warn};
1717

1818
use crate::{GraphSyncError, RapidGossipSync};
1919

@@ -305,7 +305,7 @@ where
305305
Ok(_) => {},
306306
Err(LightningError { action: ErrorAction::IgnoreDuplicateGossip, .. }) => {},
307307
Err(LightningError { action: ErrorAction::IgnoreAndLog(level), err }) => {
308-
log_given_level!(
308+
log_internal!(
309309
self.logger,
310310
level,
311311
"Failed to apply node announcement: {:?}",
@@ -444,12 +444,7 @@ where
444444
Ok(_) => {},
445445
Err(LightningError { action: ErrorAction::IgnoreDuplicateGossip, .. }) => {},
446446
Err(LightningError { action: ErrorAction::IgnoreAndLog(level), err }) => {
447-
log_given_level!(
448-
self.logger,
449-
level,
450-
"Failed to apply channel update: {:?}",
451-
err
452-
);
447+
log_internal!(self.logger, level, "Failed to apply channel update: {:?}", err);
453448
},
454449
Err(LightningError { action: ErrorAction::IgnoreError, .. }) => {},
455450
Err(e) => return Err(e.into()),

‎lightning/src/ln/peer_handler.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1411,7 +1411,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
14111411
return Err(PeerHandleError { });
14121412
},
14131413
msgs::ErrorAction::IgnoreAndLog(level) => {
1414-
log_given_level!(logger, level, "Error handling {}message{}; ignoring: {}",
1414+
log_internal!(logger, level, "Error handling {}message{}; ignoring: {}",
14151415
if level == Level::Gossip { "gossip " } else { "" },
14161416
OptionalFromDebugger(&peer_node_id), e.err);
14171417
continue
@@ -1427,7 +1427,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
14271427
continue;
14281428
},
14291429
msgs::ErrorAction::SendWarningMessage { msg, log_level } => {
1430-
log_given_level!(logger, log_level, "Error handling message{}; sending warning message with: {}", OptionalFromDebugger(&peer_node_id), e.err);
1430+
log_internal!(logger, log_level, "Error handling message{}; sending warning message with: {}", OptionalFromDebugger(&peer_node_id), e.err);
14311431
self.enqueue_message($peer, &msg);
14321432
continue;
14331433
},
@@ -2385,7 +2385,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
23852385
peers_to_disconnect.insert(node_id, Some(wire::Message::Warning(msg)));
23862386
},
23872387
msgs::ErrorAction::IgnoreAndLog(level) => {
2388-
log_given_level!(logger, level, "Received a HandleError event to be ignored for node {}", log_pubkey!(node_id));
2388+
log_internal!(logger, level, "Received a HandleError event to be ignored for node {}", log_pubkey!(node_id));
23892389
},
23902390
msgs::ErrorAction::IgnoreDuplicateGossip => {},
23912391
msgs::ErrorAction::IgnoreError => {
@@ -2398,7 +2398,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
23982398
self.enqueue_message(&mut *get_peer_for_forwarding!(&node_id)?, msg);
23992399
},
24002400
msgs::ErrorAction::SendWarningMessage { ref msg, ref log_level } => {
2401-
log_given_level!(logger, *log_level, "Handling SendWarningMessage HandleError event in peer_handler for node {} with message {}",
2401+
log_internal!(logger, *log_level, "Handling SendWarningMessage HandleError event in peer_handler for node {} with message {}",
24022402
log_pubkey!(node_id),
24032403
msg.data);
24042404
self.enqueue_message(&mut *get_peer_for_forwarding!(&node_id)?, msg);

‎lightning/src/util/macro_logger.rs

+6-22
Original file line numberDiff line numberDiff line change
@@ -179,66 +179,50 @@ macro_rules! log_internal {
179179
);
180180
}
181181

182-
/// Logs an entry at the given level.
183-
#[doc(hidden)]
184-
#[macro_export]
185-
macro_rules! log_given_level {
186-
($logger: expr, $lvl:expr, $($arg:tt)+) => (
187-
match $lvl {
188-
$crate::util::logger::Level::Error => $crate::log_internal!($logger, $lvl, $($arg)*),
189-
$crate::util::logger::Level::Warn => $crate::log_internal!($logger, $lvl, $($arg)*),
190-
$crate::util::logger::Level::Info => $crate::log_internal!($logger, $lvl, $($arg)*),
191-
$crate::util::logger::Level::Debug => $crate::log_internal!($logger, $lvl, $($arg)*),
192-
$crate::util::logger::Level::Trace => $crate::log_internal!($logger, $lvl, $($arg)*),
193-
$crate::util::logger::Level::Gossip => $crate::log_internal!($logger, $lvl, $($arg)*),
194-
}
195-
);
196-
}
197-
198182
/// Log at the `ERROR` level.
199183
#[macro_export]
200184
macro_rules! log_error {
201185
($logger: expr, $($arg:tt)*) => (
202-
$crate::log_given_level!($logger, $crate::util::logger::Level::Error, $($arg)*);
186+
$crate::log_internal!($logger, $crate::util::logger::Level::Error, $($arg)*);
203187
)
204188
}
205189

206190
/// Log at the `WARN` level.
207191
#[macro_export]
208192
macro_rules! log_warn {
209193
($logger: expr, $($arg:tt)*) => (
210-
$crate::log_given_level!($logger, $crate::util::logger::Level::Warn, $($arg)*);
194+
$crate::log_internal!($logger, $crate::util::logger::Level::Warn, $($arg)*);
211195
)
212196
}
213197

214198
/// Log at the `INFO` level.
215199
#[macro_export]
216200
macro_rules! log_info {
217201
($logger: expr, $($arg:tt)*) => (
218-
$crate::log_given_level!($logger, $crate::util::logger::Level::Info, $($arg)*);
202+
$crate::log_internal!($logger, $crate::util::logger::Level::Info, $($arg)*);
219203
)
220204
}
221205

222206
/// Log at the `DEBUG` level.
223207
#[macro_export]
224208
macro_rules! log_debug {
225209
($logger: expr, $($arg:tt)*) => (
226-
$crate::log_given_level!($logger, $crate::util::logger::Level::Debug, $($arg)*);
210+
$crate::log_internal!($logger, $crate::util::logger::Level::Debug, $($arg)*);
227211
)
228212
}
229213

230214
/// Log at the `TRACE` level.
231215
#[macro_export]
232216
macro_rules! log_trace {
233217
($logger: expr, $($arg:tt)*) => (
234-
$crate::log_given_level!($logger, $crate::util::logger::Level::Trace, $($arg)*)
218+
$crate::log_internal!($logger, $crate::util::logger::Level::Trace, $($arg)*)
235219
)
236220
}
237221

238222
/// Log at the `GOSSIP` level.
239223
#[macro_export]
240224
macro_rules! log_gossip {
241225
($logger: expr, $($arg:tt)*) => (
242-
$crate::log_given_level!($logger, $crate::util::logger::Level::Gossip, $($arg)*);
226+
$crate::log_internal!($logger, $crate::util::logger::Level::Gossip, $($arg)*);
243227
)
244228
}

0 commit comments

Comments
 (0)