Skip to content

Commit 74ecc5c

Browse files
committed
Improve logging in stop
.. we provide finer-grained logging after each step of `stop`.
1 parent df1207b commit 74ecc5c

1 file changed

Lines changed: 6 additions & 7 deletions

File tree

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
*self.background_processor_task.lock().unwrap() = Some(handle);
605601

@@ -641,7 +637,7 @@ impl Node {
641637

642638
// Stop background tasks.
643639
match self.stop_sender.send(()) {
644-
Ok(_) => (),
640+
Ok(_) => log_trace!(self.logger, "Sent shutdown signal to background tasks."),
645641
Err(e) => {
646642
log_error!(
647643
self.logger,
@@ -654,6 +650,7 @@ impl Node {
654650

655651
// Disconnect all peers.
656652
self.peer_manager.disconnect_all_peers();
653+
log_debug!(self.logger, "Disconnected all network peers.");
657654

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

666664
// Stop any runtime-dependant chain sources.
667665
self.chain_source.stop();
666+
log_debug!(self.logger, "Stopped chain sources.");
668667

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

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

0 commit comments

Comments
 (0)