kjuulh/mad
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 9 Wiki Activity

fix: make sure to close on final
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source 
Signed-off-by: kjuulh <contact@kjuulh.io>
This commit is contained in:
Kasper Juul Hermansen 2024-11-24 11:24:13 +01:00
parent 3c3f638004
commit ae0b8b703e
Signed by: kjuulh
GPG Key ID: D85D7535F18F35FA
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -266,7 +266,7 @@ dependencies = [
[[package]] [[package]]
name = "notmad" name = "notmad"
version = "0.6.0" version = "0.7.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",

16
crates/mad/src/lib.rs
View File

@ -160,18 +160,20 @@ impl Mad {
} }
tokio::spawn({ tokio::spawn({
let cancellation_token = cancellation_token.child_token(); let cancellation_token = cancellation_token;
let job_done = job_done.child_token(); let job_done = job_done.child_token();
let wait_cancel = self.should_cancel; let wait_cancel = self.should_cancel;
async move { async move {
let should_cancel = let should_cancel =
|cancel: CancellationToken, wait: Option<std::time::Duration>| async move { |cancel: CancellationToken,
global_cancel: CancellationToken,
wait: Option<std::time::Duration>| async move {
if let Some(cancel_wait) = wait { if let Some(cancel_wait) = wait {
tokio::time::sleep(cancel_wait).await;
cancel.cancel(); cancel.cancel();
tokio::time::sleep(cancel_wait).await;
global_cancel.cancel();
} }
}; };
@ -180,13 +182,13 @@ impl Mad {
job_cancellation.cancel(); job_cancellation.cancel();
} }
_ = job_done.cancelled() => { _ = job_done.cancelled() => {
should_cancel(job_cancellation, wait_cancel).await; should_cancel(job_cancellation, cancellation_token, wait_cancel).await;
} }
_ = tokio::signal::ctrl_c() => { _ = tokio::signal::ctrl_c() => {
should_cancel(job_cancellation, wait_cancel).await; should_cancel(job_cancellation, cancellation_token,wait_cancel).await;
} }
_ = signal_unix_terminate() => { _ = signal_unix_terminate() => {
should_cancel(job_cancellation, wait_cancel).await; should_cancel(job_cancellation, cancellation_token, wait_cancel).await;
} }
} }
} }