Skip to content

vhost user media device verbosity flag #2274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ser-io wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −5
Open

vhost user media device verbosity flag #2274

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions base/cvd/cuttlefish/host/commands/vhost_user_media/simple_device/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@
//! simple_device

use std::path::PathBuf;
use std::str::FromStr;
use std::sync::{Arc, RwLock};
use std::thread::{JoinHandle, spawn};

use clap::Parser;
use log::error;
use log::{LevelFilter, error};
use thiserror::Error;
use vhost_user_backend::VhostUserDaemon;
use vhu_media::VhuMediaBackend;
Expand All @@ -29,6 +30,8 @@ use vm_memory::{GuestMemoryAtomic, GuestMemoryMmap};

#[derive(Debug, Error)]
pub(crate) enum Error {
#[error("Failed to parse verbosity level: {0}")]
ParseLevelError(log::ParseLevelError),
#[error("Could not create daemon: {0}")]
CouldNotCreateDaemon(vhost_user_backend::Error),
#[error("Fatal error: {0}")]
Expand All @@ -43,6 +46,9 @@ struct CmdLineArgs {
/// Location of vhost-user Unix domain socket.
#[clap(short, long, value_name = "SOCKET")]
socket_path: PathBuf,
/// Log verbosity, one of Off, Error, Warning, Info, Debug, Trace.
#[clap(short, long, default_value_t = String::from("Debug") )]
verbosity: String,
}

#[derive(PartialEq, Debug)]
Expand All @@ -60,10 +66,17 @@ impl TryFrom<CmdLineArgs> for Config {
}
}

fn init_logging(verbosity: &str) -> Result<()> {
env_logger::builder()
.format_timestamp_secs()
.filter_level(LevelFilter::from_str(verbosity).map_err(Error::ParseLevelError)?)
.init();
Ok(())
}

const VFL_TYPE_VIDEO: u32 = 0;

fn start_backend(args: CmdLineArgs) -> Result<()> {
let config = Config::try_from(args)?;
fn start_backend(config: Config) -> Result<()> {
let socket_path = config.socket_path.clone();
let handle: JoinHandle<Result<()>> = spawn(move || {
loop {
Expand Down Expand Up @@ -96,7 +109,9 @@ fn start_backend(args: CmdLineArgs) -> Result<()> {
}

fn main() -> Result<()> {
env_logger::init();
let args = CmdLineArgs::parse();

init_logging(&args.verbosity)?;

start_backend(CmdLineArgs::parse())
start_backend(Config::try_from(args)?)
}
Loading