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

WorkerTask: add warnings and count them 

so that we have one level more between errors and OK

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2020-06-24 09:04:35 +02:00 committed by Dietmar Maurer
parent 3f0b9c10ec
commit f6de2c7359
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/server/worker_task.rs
View File

@ -213,6 +213,8 @@ pub fn upid_read_status(upid: &UPID) -> Result<String, Error> {
Some(rest) => { Some(rest) => {
if rest == "OK" { if rest == "OK" {
status = String::from(rest); status = String::from(rest);
} else if rest.starts_with("WARNINGS: ") {
status = String::from(rest);
} else if rest.starts_with("ERROR: ") { } else if rest.starts_with("ERROR: ") {
status = String::from(&rest[7..]); status = String::from(&rest[7..]);
} }
@ -234,7 +236,7 @@ pub struct TaskListInfo {
pub upid_str: String, pub upid_str: String,
/// Task `(endtime, status)` if already finished /// Task `(endtime, status)` if already finished
/// ///
/// The `status` ise iether `unknown`, `OK`, or `ERROR: ...` /// The `status` is either `unknown`, `OK`, `WARN`, or `ERROR: ...`
pub state: Option<(i64, String)>, // endtime, status pub state: Option<(i64, String)>, // endtime, status
} }
@ -385,6 +387,7 @@ impl std::fmt::Display for WorkerTask {
struct WorkerTaskData { struct WorkerTaskData {
logger: FileLogger, logger: FileLogger,
progress: f64, // 0..1 progress: f64, // 0..1
warn_count: u64,
pub abort_listeners: Vec<oneshot::Sender<()>>, pub abort_listeners: Vec<oneshot::Sender<()>>,
} }
@ -424,6 +427,7 @@ impl WorkerTask {
data: Mutex::new(WorkerTaskData { data: Mutex::new(WorkerTaskData {
logger, logger,
progress: 0.0, progress: 0.0,
warn_count: 0,
abort_listeners: vec![], abort_listeners: vec![],
}), }),
}); });
@ -507,8 +511,11 @@ impl WorkerTask {
/// Log task result, remove task from running list /// Log task result, remove task from running list
pub fn log_result(&self, result: &Result<(), Error>) { pub fn log_result(&self, result: &Result<(), Error>) {
let warn_count = self.data.lock().unwrap().warn_count;
if let Err(err) = result { if let Err(err) = result {
self.log(&format!("TASK ERROR: {}", err)); self.log(&format!("TASK ERROR: {}", err));
} else if warn_count > 0 {
self.log(format!("TASK WARNINGS: {}", warn_count));
} else { } else {
self.log("TASK OK"); self.log("TASK OK");
} }
@ -524,6 +531,13 @@ impl WorkerTask {
data.logger.log(msg); data.logger.log(msg);
} }
/// Log a message as warning.
pub fn warn<S: AsRef<str>>(&self, msg: S) {
let mut data = self.data.lock().unwrap();
data.logger.log(format!("WARN: {}", msg.as_ref()));
data.warn_count += 1;
}
/// Set progress indicator /// Set progress indicator
pub fn progress(&self, progress: f64) { pub fn progress(&self, progress: f64) {
if progress >= 0.0 && progress <= 1.0 { if progress >= 0.0 && progress <= 1.0 {