proxmox-mirrors/proxmox
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox synced 2025-04-28 20:29:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rest-server: Improved panic errors with formatted strings

Browse Source 
Improved errors when panics occur and the panic message is a
formatted (not static) string. This worked already for &str literals,
but not for Strings.

Downcasting to both &str and String is also done by the Rust Standard
Library in the default panic handler. See:
b605c65b6e/library/std/src/panicking.rs (L777)

Signed-off-by: Laurențiu Leahu-Vlăducu <l.leahu-vladucu@proxmox.com>
This commit is contained in:
Laurențiu Leahu-Vlăducu 2025-01-24 16:29:10 +01:00 committed by Thomas Lamprecht
parent f639695c87
commit 922c605d69
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -980,9 +980,14 @@ impl WorkerTask {
let result = match std::panic::catch_unwind(move || f(worker1)) { let result = match std::panic::catch_unwind(move || f(worker1)) {
Ok(r) => r, Ok(r) => r,
Err(panic) => match panic.downcast::<&str>() { Err(panic) => {
Ok(panic_msg) => Err(format_err!("worker panicked: {}", panic_msg)), if let Some(panic_msg) = panic.downcast_ref::<&str>() {
Err(_) => Err(format_err!("worker panicked: unknown type.")), Err(format_err!("worker panicked: {panic_msg}"))
} else if let Some(panic_msg) = panic.downcast_ref::<String>() {
Err(format_err!("worker panicked: {panic_msg}"))
} else {
Err(format_err!("worker panicked: cannot show error message due to unknown error type."))
}
}, },
}; };