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

src/server/worker_task.rs: move common code into log_result

Browse Source 
Make new() pub
This commit is contained in:
Dietmar Maurer 2019-04-15 07:49:03 +02:00
parent 37b87869b5
commit 418def7a78
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/server/worker_task.rs
View File

@ -352,7 +352,7 @@ impl Drop for WorkerTask {
impl WorkerTask { impl WorkerTask {
fn new(worker_type: &str, worker_id: Option<String>, username: &str, to_stdout: bool) -> Result<Arc<Self>, Error> { pub fn new(worker_type: &str, worker_id: Option<String>, username: &str, to_stdout: bool) -> Result<Arc<Self>, Error> {
println!("register worker"); println!("register worker");
let upid = UPID::new(worker_type, worker_id, username)?; let upid = UPID::new(worker_type, worker_id, username)?;
@ -406,14 +406,10 @@ impl WorkerTask {
T: Send + 'static + Future<Item=(), Error=Error>, T: Send + 'static + Future<Item=(), Error=Error>,
{ {
let worker = WorkerTask::new(worker_type, worker_id, username, to_stdout)?; let worker = WorkerTask::new(worker_type, worker_id, username, to_stdout)?;
let task_id = worker.upid.task_id;
let upid_str = worker.upid.to_string(); let upid_str = worker.upid.to_string();
tokio::spawn(f(worker.clone()).then(move |result| { tokio::spawn(f(worker.clone()).then(move |result| {
WORKER_TASK_LIST.lock().unwrap().remove(&task_id);
worker.log_result(result); worker.log_result(result);
let _ = update_active_workers(None);
super::set_worker_count(WORKER_TASK_LIST.lock().unwrap().len());
Ok(()) Ok(())
})); }));
@ -435,7 +431,6 @@ impl WorkerTask {
let (p, c) = oneshot::channel::<()>(); let (p, c) = oneshot::channel::<()>();
let worker = WorkerTask::new(worker_type, worker_id, username, to_stdout)?; let worker = WorkerTask::new(worker_type, worker_id, username, to_stdout)?;
let task_id = worker.upid.task_id;
let upid_str = worker.upid.to_string(); let upid_str = worker.upid.to_string();
let _child = std::thread::spawn(move || { let _child = std::thread::spawn(move || {
@ -454,12 +449,8 @@ impl WorkerTask {
} }
}; };
//let result = f(worker.clone());
WORKER_TASK_LIST.lock().unwrap().remove(&task_id);
worker.log_result(result); worker.log_result(result);
let _ = update_active_workers(None);
p.send(()).unwrap(); p.send(()).unwrap();
super::set_worker_count(WORKER_TASK_LIST.lock().unwrap().len());
}); });
tokio::spawn(c.then(|_| Ok(()))); tokio::spawn(c.then(|_| Ok(())));
@ -467,12 +458,18 @@ impl WorkerTask {
Ok(upid_str) Ok(upid_str)
} }
fn log_result(&self, result: Result<(), Error>) { /// Log task result, remove task from running list
pub fn log_result(&self, result: Result<(), Error>) {
if let Err(err) = result { if let Err(err) = result {
self.log(&format!("TASK ERROR: {}", err)); self.log(&format!("TASK ERROR: {}", err));
} else { } else {
self.log("TASK OK"); self.log("TASK OK");
} }
WORKER_TASK_LIST.lock().unwrap().remove(&self.upid.task_id);
let _ = update_active_workers(None);
super::set_worker_count(WORKER_TASK_LIST.lock().unwrap().len());
} }
/// Log a message. /// Log a message.