Skip to content

fix(electrum): handle shutdown race in acceptor thread #209

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

Open
EddieHouston wants to merge 1 commit into
base: new-index
Choose a base branch
from
+8 −2
Open

fix(electrum): handle shutdown race in acceptor thread #209

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
10 changes: 8 additions & 2 deletions src/electrum/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -766,7 +766,11 @@ impl RPC {
}
})
}
Notification::Exit => acceptor.send(None).unwrap(), // mark acceptor as done
Notification::Exit => {
if acceptor.send(None).is_err() {
warn!("acceptor already shut down before Exit notification");
}
}
}
}
});
Expand All @@ -789,7 +793,9 @@ impl RPC {
stream
.set_nonblocking(false)
.expect("failed to set connection as blocking");
acceptor.send(Some((stream, addr))).expect("send failed");
if acceptor.send(Some((stream, addr))).is_err() {
break; // receiver dropped, server is shutting down
}
}
});
chan
Expand Down
Loading