Skip to content

Commit d3f7e4d

Browse files
committed
Add log scope to send_payment
Demonstrating how the proc macro can be used to set a thread-local logger at a public entry point. The scope name is also picked up and logged via log statements that still have an explicit logger instance.
1 parent c4764db commit d3f7e4d

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

lightning/src/ln/channelmanager.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ use bitcoin::constants::ChainHash;
2222
use bitcoin::key::constants::SECRET_KEY_SIZE;
2323
use bitcoin::network::Network;
2424
use bitcoin::transaction::Transaction;
25+
use lightning_macros::log_scope;
2526

2627
use bitcoin::hash_types::{BlockHash, Txid};
2728
use bitcoin::hashes::hmac::Hmac;
@@ -5442,6 +5443,7 @@ where
54425443
/// [`UpdateHTLCs`]: MessageSendEvent::UpdateHTLCs
54435444
/// [`PeerManager::process_events`]: crate::ln::peer_handler::PeerManager::process_events
54445445
/// [`ChannelMonitorUpdateStatus::InProgress`]: crate::chain::ChannelMonitorUpdateStatus::InProgress
5446+
#[log_scope(name = "send_payment")]
54455447
pub fn send_payment(
54465448
&self, payment_hash: PaymentHash, recipient_onion: RecipientOnionFields,
54475449
payment_id: PaymentId, route_params: RouteParameters, retry_strategy: Retry,
@@ -8876,7 +8878,8 @@ where
88768878
ComplFunc: FnOnce(
88778879
Option<u64>,
88788880
bool,
8879-
) -> (Option<MonitorUpdateCompletionAction>, Option<RAAMonitorUpdateBlockingAction>),
8881+
)
8882+
-> (Option<MonitorUpdateCompletionAction>, Option<RAAMonitorUpdateBlockingAction>),
88808883
>(
88818884
&self, prev_hop: HTLCPreviousHopData, payment_preimage: PaymentPreimage,
88828885
payment_info: Option<PaymentClaimDetails>, attribution_data: Option<AttributionData>,
@@ -8914,7 +8917,8 @@ where
89148917
ComplFunc: FnOnce(
89158918
Option<u64>,
89168919
bool,
8917-
) -> (Option<MonitorUpdateCompletionAction>, Option<RAAMonitorUpdateBlockingAction>),
8920+
)
8921+
-> (Option<MonitorUpdateCompletionAction>, Option<RAAMonitorUpdateBlockingAction>),
89188922
>(
89198923
&self, prev_hop: HTLCClaimSource, payment_preimage: PaymentPreimage,
89208924
payment_info: Option<PaymentClaimDetails>, attribution_data: Option<AttributionData>,

0 commit comments

Comments
 (0)