Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-13 11:56:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: await the tasks after aborting them

Browse Source
This commit is contained in:
link2xt
2024-07-30 00:39:26 +00:00
parent c163438eaf
commit 490f41cda8
3 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/scheduler.rs
View File

@@ -110,13 +110,14 @@ impl SchedulerState {
// to allow for clean shutdown.
context.new_msgs_notify.notify_one();
if let Some(debug_logging) = context
let debug_logging = context
.debug_logging
.read()
.write()
.expect("RwLock is poisoned")
.as_ref()
{
.take();
if let Some(debug_logging) = debug_logging {
debug_logging.loop_handle.abort();
debug_logging.loop_handle.await.ok();
}
let prev_state = std::mem::replace(&mut *inner, new_state);
context.emit_event(EventType::ConnectivityChanged);
@@ -974,9 +975,16 @@ impl Scheduler {
.await
.log_err(context)
.ok();
// Abort tasks, then await them to ensure the `Future` is dropped.
// Just aborting the task may keep resources such as `Context` clone
// moved into it indefinitely, resulting in database not being
// closed etc.
self.ephemeral_handle.abort();
self.ephemeral_handle.await.ok();
self.location_handle.abort();
self.recently_seen_loop.abort();
self.location_handle.await.ok();
self.recently_seen_loop.abort().await;
}
}