Skip to content

Commit c3d6161

Browse files
committed
Improve logging in stop
.. we provide finer-grained logging after each step of `stop`.
1 parent 9eae61d commit c3d6161

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

src/lib.rs

Lines changed: 5 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);
@@ -645,7 +641,7 @@ impl Node {
645641

646642
// Stop the runtime.
647643
match self.stop_sender.send(()) {
648-
Ok(_) => (),
644+
Ok(_) => log_trace!(self.logger, "Sent shutdown signal to background tasks."),
649645
Err(e) => {
650646
log_error!(
651647
self.logger,
@@ -658,9 +654,11 @@ impl Node {
658654

659655
// Disconnect all peers.
660656
self.peer_manager.disconnect_all_peers();
657+
log_debug!(self.logger, "Disconnected all network peers.");
661658

662659
// Stop any runtime-dependant chain sources.
663660
self.chain_source.stop();
661+
log_debug!(self.logger, "Stopped chain sources.");
664662

665663
// Wait until background processing stopped, at least until a timeout is reached.
666664
if let Some(background_processor_task) =
@@ -679,7 +677,7 @@ impl Node {
679677

680678
match timeout_res {
681679
Ok(stop_res) => match stop_res {
682-
Ok(()) => {},
680+
Ok(()) => log_debug!(self.logger, "Stopped background processing of events."),
683681
Err(e) => {
684682
abort_handle.abort();
685683
log_error!(

0 commit comments

Comments
 (0)