kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: streamline printing of error chains

Browse Source 
In [0] we agreed on the current format.

- Use `: ` over ` => `
- Streamline usages in a helper

Context https://github.com/cloud-hypervisor/cloud-hypervisor/issues/8510

[0] https://github.com/cloud-hypervisor/cloud-hypervisor/pull/7066

On-behalf-of: SAP philipp.schuster@sap.com
Signed-off-by: Philipp Schuster <philipp.schuster@cyberus-technology.de>
This commit is contained in:
Philipp Schuster
2026-07-02 15:04:32 +02:00
committed by Rob Bradford
parent 53a00c0514
commit da80fde887
2 changed files with 42 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
vmm/src/api/http/mod.rs
View File

@@ -12,7 +12,7 @@ use std::panic::AssertUnwindSafe;
use std::path::{Path, PathBuf};
use std::sync::LazyLock;
use std::sync::mpsc::Sender;
use std::{fs, iter, panic, result, thread};
use std::{fs, panic, result, thread};
use block::fcntl::{LockError, LockGranularity, LockType, try_acquire_lock};
use log::{error, info};
@@ -35,6 +35,7 @@ use crate::api::{
};
use crate::landlock::Landlock;
use crate::seccomp_filters::{Thread, get_seccomp_filter};
use crate::util::{error_chain_messages, flatten_error_chain_to_string};
use crate::vm::Error as VmError;
use crate::{Error as VmmError, Result};
@@ -102,20 +103,13 @@ const HTTP_ROOT: &str = "/api/v1";
pub fn error_response(error: HttpError) -> Response {
let mut response = Response::new(Version::Http11, error.status_code());
let error: &dyn Error = &error;
// Write the Display::display() output all errors (from top to root).
let error_messages = iter::successors(Some(error), |sub_error| {
// Dereference necessary to mitigate rustc compiler bug.
// See <https://github.com/rust-lang/rust/issues/141673>
(*sub_error).source()
})
.map(|error| format!("{error}"))
.collect::<Vec<_>>();
info!("HTTP API error response: {}", error_messages.join(": "));
info!(
"HTTP API error response: {}",
flatten_error_chain_to_string(&error)
);
// TODO: Move `api` module from `vmm` to dedicated crate and use a common type definition
let json = serde_json::to_string(&error_messages).unwrap();
let json = serde_json::to_string(&error_chain_messages(&error)).unwrap();
let body = Body::new(json);
response.set_body(body);