Skip to content

node: Exit the peer thread promptly on shutdown #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rustaceanrob merged 1 commit into from
Jul 29, 2026
Merged

node: Exit the peer thread promptly on shutdown #90

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/bin/node.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,9 @@ fn run(
continue;
}
};
if !running_peer.load(Ordering::SeqCst) {
break;
}
loop {
if let Err(e) = peer.receive_and_process_message(&mut node_state) {
match e {
Expand All @@ -386,7 +389,7 @@ fn run(
let addr_processing_handler = thread::spawn(move || {
info!(target: Category::NODE, "Starting addr processing thread.");
while running_addr.load(Ordering::SeqCst) {
match addr_rx.recv() {
match addr_rx.recv_timeout(Duration::from_secs(1)) {
Ok(payload) => {
let mut addr_lock = addrman.lock().unwrap();
for address in payload {
Expand All @@ -399,7 +402,8 @@ fn run(
addr_lock.add(&record);
}
}
Err(_) => break,
Err(RecvTimeoutError::Timeout) => continue,
Err(RecvTimeoutError::Disconnected) => break,
}
}
info!(target: Category::NODE, "Stopping addr processing thread.");
Expand Down Expand Up @@ -516,13 +520,13 @@ fn run(
});

if let Ok(()) = shutdown_rx.recv() {
info!(target: Category::NODE, "Received shutdown signal, shutting down...");
running.store(false, Ordering::SeqCst);
context.interrupt().unwrap();
let mut peer_lock = kill.lock().unwrap();
if let Some(conn) = peer_lock.deref_mut() {
conn.shutdown().unwrap()
}
info!(target: Category::NODE, "Received shutdown signal, shutting down...");
running.store(false, Ordering::SeqCst);
}

addr_processing_handler.join().unwrap();
Expand Down
Loading