[pbs-devel] [RFC proxmox v2 3/4] rest-server: make worker task creation error handling more idiomatic

From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [RFC proxmox v2 3/4] rest-server: make worker task creation error handling more idiomatic
Date: Mon,  2 Dec 2024 14:04:11 +0100	[thread overview]
Message-ID: <20241202130412.1290616-4-f.gruenbichler@proxmox.com> (raw)
In-Reply-To: <20241202130412.1290616-1-f.gruenbichler@proxmox.com>

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---

Notes:
    best I could come up with ;) feel free to fold that one in

 proxmox-rest-server/src/worker_task.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/proxmox-rest-server/src/worker_task.rs b/proxmox-rest-server/src/worker_task.rs
index bbf82ff9..74828855 100644
--- a/proxmox-rest-server/src/worker_task.rs
+++ b/proxmox-rest-server/src/worker_task.rs
@@ -928,10 +928,10 @@ impl WorkerTask {
         if res.is_err() {
             // needed to undo the insertion into WORKER_TASK_LIST above
             worker.log_result(&res);
-            res?
+            Err(res.unwrap_err())
+        } else {
+            Ok((worker, logger))
         }
-
-        Ok((worker, logger))
     }
 
     /// Spawn a new tokio task/future.
-- 
2.39.5



_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
