noth/surrealpatch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix cancelling task leading to an error ()

Browse source
This commit is contained in:
Mees Delzenne 2024-06-18 16:49:04 +02:00 committed by GitHub
parent 26de6072aa
commit befb185f1d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 21 additions and 11 deletions

32
lib/src/api/engine/tasks.rs
View file

@ -37,17 +37,27 @@ pub struct Tasks {
impl Tasks {
#[cfg(not(target_arch = "wasm32"))]
pub async fn resolve(self) -> Result<(), RootError> {
self.nd.await.map_err(|e| {
error!("Node agent task failed: {}", e);
let inner_err = crate::err::Error::NodeAgent("node task failed and has been logged");
RootError::Db(inner_err)
})?;
self.lq.await.map_err(|e| {
error!("Live query task failed: {}", e);
let inner_err =
crate::err::Error::NodeAgent("live query task failed and has been logged");
RootError::Db(inner_err)
})?;
match self.nd.await {
// cancelling this task is fine, and can happen when surrealdb exits.
Ok(_) => {}
Err(e) if e.is_cancelled() => {}
Err(e) => {
error!("Node agent task failed: {}", e);
let inner_err =
crate::err::Error::NodeAgent("node task failed and has been logged");
return Err(RootError::Db(inner_err));
}
}
match self.lq.await {
Ok(_) => {}
Err(e) if e.is_cancelled() => {}
Err(e) => {
error!("Live query task failed: {}", e);
let inner_err =
crate::err::Error::NodeAgent("live query task failed and has been logged");
return Err(RootError::Db(inner_err));
}
};
Ok(())
}
}