diff --git a/Cargo.lock b/Cargo.lock index a0ce30814..1dfcd3afe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -409,6 +409,7 @@ dependencies = [ "clap", "dhat", "dirs", + "env_logger", "epoll", "event_monitor", "hypervisor", diff --git a/Cargo.toml b/Cargo.toml index 5f21b99a0..a913cb600 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,6 +33,7 @@ anyhow = "1.0.94" api_client = { path = "api_client" } clap = { version = "4.5.13", features = ["string"] } dhat = { version = "0.3.3", optional = true } +env_logger = { workspace = true } epoll = "4.3.3" event_monitor = { path = "event_monitor" } hypervisor = { path = "hypervisor" } diff --git a/src/bin/ch-remote.rs b/src/bin/ch-remote.rs index 9d8c4f68b..4278af617 100644 --- a/src/bin/ch-remote.rs +++ b/src/bin/ch-remote.rs @@ -17,6 +17,7 @@ use api_client::{ Error as ApiClientError, }; use clap::{Arg, ArgAction, ArgMatches, Command}; +use log::error; use option_parser::{ByteSized, ByteSizedParseError}; use thiserror::Error; use vmm::config::RestoreConfig; @@ -1071,6 +1072,7 @@ fn get_cli_commands_sorted() -> Box<[Command]> { } fn main() { + env_logger::init(); let app = Command::new("ch-remote") .author(env!("CARGO_PKG_AUTHORS")) .version(env!("BUILD_VERSION")) @@ -1092,7 +1094,7 @@ fn main() { #[cfg(not(feature = "dbus_api"))] (Some(api_sock),) => TargetApi::HttpApi( UnixStream::connect(api_sock).unwrap_or_else(|e| { - eprintln!("Error opening HTTP socket: {e}"); + error!("Error opening HTTP socket: {e}"); process::exit(1) }), PhantomData, @@ -1100,7 +1102,7 @@ fn main() { #[cfg(feature = "dbus_api")] (Some(api_sock), None, None) => TargetApi::HttpApi( UnixStream::connect(api_sock).unwrap_or_else(|e| { - eprintln!("Error opening HTTP socket: {e}"); + error!("Error opening HTTP socket: {e}"); process::exit(1) }), PhantomData, @@ -1114,19 +1116,19 @@ fn main() { ) .map_err(Error::DBusApiClient) .unwrap_or_else(|e| { - eprintln!("Error creating D-Bus proxy: {e}"); + error!("Error creating D-Bus proxy: {e}"); process::exit(1) }), ), #[cfg(feature = "dbus_api")] (Some(_), Some(_) | None, Some(_) | None) => { - println!( + error!( "`api-socket` and (dbus-service-name or dbus-object-path) are mutually exclusive" ); process::exit(1); } _ => { - println!("Please either provide the api-socket option or dbus-service-name and dbus-object-path options"); + error!("Please either provide the api-socket option or dbus-service-name and dbus-object-path options"); process::exit(1); } };