Proxmox-Port/proxmox
1
0
Fork 0
forked from proxmox-mirrors/proxmox
Code Pull Requests Activity

rename TaskState to WorkerTaskContext

Browse Source
This commit is contained in:
Dietmar Maurer 2021-09-24 07:40:49 +02:00
parent 85ec987a48
commit 7a4bb6000e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,6 +20,7 @@ use proxmox::try_block;
use proxmox::tools::fs::{create_path, replace_file, atomic_open_or_create_file, CreateOptions}; use proxmox::tools::fs::{create_path, replace_file, atomic_open_or_create_file, CreateOptions};
use proxmox::api::upid::UPID; use proxmox::api::upid::UPID;
use pbs_tools::task::WorkerTaskContext;
use pbs_tools::logrotate::{LogRotate, LogRotateFiles}; use pbs_tools::logrotate::{LogRotate, LogRotateFiles};
use crate::{CommandoSocket, FileLogger, FileLogOptions}; use crate::{CommandoSocket, FileLogger, FileLogOptions};
@ -834,7 +835,7 @@ impl WorkerTask {
} }
/// Fail if abort was requested. /// Fail if abort was requested.
pub fn fail_on_abort(&self) -> Result<(), Error> { pub fn check_abort(&self) -> Result<(), Error> {
if self.abort_requested() { if self.abort_requested() {
bail!("abort requested - aborting task"); bail!("abort requested - aborting task");
} }
@ -859,9 +860,9 @@ impl WorkerTask {
} }
} }
impl pbs_tools::task::TaskState for WorkerTask { impl WorkerTaskContext for WorkerTask {
fn check_abort(&self) -> Result<(), Error> { fn check_abort(&self) -> Result<(), Error> {
self.fail_on_abort() self.check_abort()
} }
fn log(&self, level: log::Level, message: &std::fmt::Arguments) { fn log(&self, level: log::Level, message: &std::fmt::Arguments) {