diff options
| author | Toby Vincent <tobyv13@gmail.com> | 2022-02-18 16:10:31 -0600 |
|---|---|---|
| committer | Toby Vincent <tobyv13@gmail.com> | 2022-02-18 16:10:31 -0600 |
| commit | d28b7c80bd0f6ebeb47c2af53daa6e9cf049d298 (patch) | |
| tree | af97b9addd04086920d91761ed12af48e36ece56 /zoned | |
| parent | df6d914b6b215c5d8fa67071e8585bc17705d57b (diff) | |
refactor(nspawn): refactor nspawn to follow others
Refactor zone_nspawn to follow the same structure as the other crates
Diffstat (limited to 'zoned')
| -rw-r--r-- | zoned/Cargo.toml | 1 | ||||
| -rw-r--r-- | zoned/src/api.rs | 9 |
2 files changed, 6 insertions, 4 deletions
diff --git a/zoned/Cargo.toml b/zoned/Cargo.toml index 28d1650..b731a0a 100644 --- a/zoned/Cargo.toml +++ b/zoned/Cargo.toml @@ -19,6 +19,7 @@ rocket = { version = "0.5.0-rc.1", default-features = false, features = ["json"] rocket_okapi = { version = "0.8.0-rc.1", features = ["rapidoc", "swagger"] } serde = "1.0.136" thiserror = "1.0.30" +tracing = "0.1.31" zone_core = { version = "0.1.0", path = "../zone_core" } zone_nspawn = { version = "0.1.0", path = "../zone_nspawn" } zone_zfs = { version = "0.1.0", path = "../zone_zfs" } diff --git a/zoned/src/api.rs b/zoned/src/api.rs index a1a892e..5a00467 100644 --- a/zoned/src/api.rs +++ b/zoned/src/api.rs @@ -5,6 +5,7 @@ use rocket_okapi::{ settings::UrlObject, swagger_ui::{make_swagger_ui, SwaggerUIConfig}, }; +use tracing::warn; use zone_core::{Container, PartialEqOrDefault}; use zone_zfs::ZFS; @@ -26,14 +27,14 @@ pub fn test_endpoint(zfs: &State<zone_zfs::ZFS>) -> Json<String> { #[get("/container/list?<container..>")] pub fn container_list(container: Container) -> Json<Vec<Container>> { zone_nspawn::get_containers() - .unwrap_or_else(|_err| { - todo!("Log this error"); + .unwrap_or_else(|err| { + warn!("Invalid nspawn container found: {}", err); Default::default() }) .into_iter() .map(|c| { - c.try_into().unwrap_or_else(|_err| { - todo!("Log this error"); + c.try_into().unwrap_or_else(|err| { + warn!("Invalid nspawn container found: {}", err); Default::default() }) }) |