From 3f742f952a6d1579251211cf7d4a70d8312e7a5c Mon Sep 17 00:00:00 2001 From: Dominik Csapak Date: Tue, 21 Sep 2021 12:11:12 +0200 Subject: [PATCH] server: refactor abort_local_worker we'll need this outside the module Signed-off-by: Dominik Csapak Signed-off-by: Thomas Lamprecht --- src/server/worker_task.rs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/server/worker_task.rs b/src/server/worker_task.rs index 565ce154..a74b18e1 100644 --- a/src/server/worker_task.rs +++ b/src/server/worker_task.rs @@ -100,9 +100,8 @@ pub fn register_task_control_commands( commando_sock.register_command("worker-task-abort".into(), move |args| { let upid = get_upid(args)?; - if let Some(ref worker) = WORKER_TASK_LIST.lock().unwrap().get(&upid.task_id) { - worker.request_abort(); - } + abort_local_worker(upid); + Ok(Value::Null) })?; commando_sock.register_command("worker-task-status".into(), move |args| { @@ -828,3 +827,10 @@ pub async fn wait_for_local_worker(upid_str: &str) -> Result<(), Error> { } Ok(()) } + +/// Request abort of a local worker (if existing and running) +pub fn abort_local_worker(upid: UPID) { + if let Some(ref worker) = WORKER_TASK_LIST.lock().unwrap().get(&upid.task_id) { + worker.request_abort(); + } +}