Skip to content

Commit 7c773a1

Browse files
committed
Improve logging in stop
.. we provide finer-grained logging after each step of `stop`.
1 parent d475749 commit 7c773a1

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

src/lib.rs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,7 @@ use types::{
147147
};
148148
pub use types::{ChannelDetails, CustomTlvRecord, PeerDetails, UserChannelId};
149149

150-
#[cfg(tokio_unstable)]
151-
use logger::log_trace;
152-
use logger::{log_debug, log_error, log_info, LdkLogger, Logger};
150+
use logger::{log_debug, log_error, log_info, log_trace, LdkLogger, Logger};
153151

154152
use lightning::chain::BestBlock;
155153
use lightning::events::bump_transaction::Wallet as LdkWallet;
@@ -578,7 +576,6 @@ impl Node {
578576
})
579577
};
580578

581-
let background_stop_logger = Arc::clone(&self.logger);
582579
let handle = runtime.spawn(async move {
583580
process_events_async(
584581
background_persister,
@@ -599,7 +596,6 @@ impl Node {
599596
log_error!(background_error_logger, "Failed to process events: {}", e);
600597
panic!("Failed to process events");
601598
});
602-
log_debug!(background_stop_logger, "Events processing stopped.",);
603599
});
604600
debug_assert!(self.background_processor_task.lock().unwrap().is_none());
605601
*self.background_processor_task.lock().unwrap() = Some(handle);
@@ -642,7 +638,7 @@ impl Node {
642638

643639
// Stop background tasks.
644640
match self.stop_sender.send(()) {
645-
Ok(_) => (),
641+
Ok(_) => log_trace!(self.logger, "Sent shutdown signal to background tasks."),
646642
Err(e) => {
647643
log_error!(
648644
self.logger,
@@ -655,6 +651,7 @@ impl Node {
655651

656652
// Disconnect all peers.
657653
self.peer_manager.disconnect_all_peers();
654+
log_debug!(self.logger, "Disconnected all network peers.");
658655

659656
// Ensure we process the broadcast queue one last time, as we may have generated
660657
// force-closures during peer disconnection.
@@ -663,9 +660,11 @@ impl Node {
663660
tokio::task::block_in_place(move || {
664661
runtime_ref.block_on(async { chain_source.try_process_broadcast_queue().await })
665662
});
663+
log_debug!(self.logger, "Disconnected all network peers.");
666664

667665
// Stop any runtime-dependant chain sources.
668666
self.chain_source.stop();
667+
log_debug!(self.logger, "Stopped chain sources.");
669668

670669
// Wait until background processing stopped, at least until a timeout is reached.
671670
if let Some(background_processor_task) =
@@ -684,7 +683,7 @@ impl Node {
684683

685684
match timeout_res {
686685
Ok(stop_res) => match stop_res {
687-
Ok(()) => {},
686+
Ok(()) => log_debug!(self.logger, "Stopped background processing of events."),
688687
Err(e) => {
689688
abort_handle.abort();
690689
log_error!(

0 commit comments

Comments
 (0)