tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cleanup WorkerTaskContext

Browse Source
This commit is contained in:
Dietmar Maurer
2021-09-24 11:39:30 +02:00
parent 1ec0d70d09
commit 619cd5cbcb
5 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
proxmox-rest-server/src/worker_task.rs
View File

@ -829,19 +829,6 @@ impl WorkerTask {
}
}
/// Test if abort was requested.
pub fn abort_requested(&self) -> bool {
self.abort_requested.load(Ordering::SeqCst)
}
/// Fail if abort was requested.
pub fn check_abort(&self) -> Result<(), Error> {
if self.abort_requested() {
bail!("abort requested - aborting task");
}
Ok(())
}
/// Get a future which resolves on task abort
pub fn abort_future(&self) -> oneshot::Receiver<()> {
let (tx, rx) = oneshot::channel::<()>();
@ -861,8 +848,9 @@ impl WorkerTask {
}
impl WorkerTaskContext for WorkerTask {
fn check_abort(&self) -> Result<(), Error> {
self.check_abort()
fn abort_requested(&self) -> bool {
self.abort_requested.load(Ordering::SeqCst)
}
fn log(&self, level: log::Level, message: &std::fmt::Arguments) {