Skip to content

shut down watcher service before threads join #732

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
stark-3k wants to merge 1 commit into
base: master
Choose a base branch
from
Open

shut down watcher service before threads join #732

Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions src/maker/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,6 +663,9 @@ pub fn start_maker_server(maker: Arc<Maker>) -> Result<(), MakerError> {
}

log::info!("[{network_port}] Maker is shutting down.");

maker.watch_service.shutdown();

maker.thread_pool.join_all_threads()?;

log::info!("sync at:----Shutdown wallet----");
Expand Down
2 changes: 2 additions & 0 deletions src/maker/server2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -800,6 +800,8 @@ pub fn start_maker_server_taproot(maker: Arc<Maker>) -> Result<(), MakerError> {
maker.config.network_port
);

maker.watch_service.shutdown();

// Join all threads
maker.thread_pool.join_all_threads()?;

Expand Down
Loading