leyoda/rqbit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove annoying error message when task is cancelled

Browse source
This commit is contained in:
Igor Katson 2024-06-21 15:12:51 +01:00
parent ace4bed0c6
commit 36359150a7
No known key found for this signature in database
GPG key ID: B4EC22B66D61A3F5
1 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/librqbit_core/src/spawn_utils.rs
View file

@ -1,6 +1,15 @@
use anyhow::bail;
use tokio_util::sync::CancellationToken;
use tracing::{error, trace, Instrument};
use tracing::{debug, error, trace, Instrument};
#[derive(Debug)]
struct CancelledError {}
impl std::error::Error for CancelledError {}
impl std::fmt::Display for CancelledError {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
f.write_str("cancelled")
}
}
/// Spawns a future with tracing instrumentation.
pub fn spawn(
@ -23,7 +32,12 @@ pub fn spawn(
trace!("finished");
}
Err(e) => {
error!("finished with error: {:#}", e)
if e.is::<CancelledError>() {
debug!("task cancelled")
} else {
error!("finished with error: {:#}", e)
}
}
}
return;
@ -43,7 +57,7 @@ pub fn spawn_with_cancel(
spawn(span, async move {
tokio::select! {
_ = cancellation_token.cancelled() => {
bail!("cancelled");
bail!(CancelledError{})
},
r = fut => r
}