diff --git a/crates/arc-cli/src/cli_config.rs b/crates/arc-cli/src/cli_config.rs index 0ec03ef7d..b256104bc 100644 --- a/crates/arc-cli/src/cli_config.rs +++ b/crates/arc-cli/src/cli_config.rs @@ -44,11 +44,6 @@ pub struct CliGitConfig { pub author: arc_api::server_config::GitAuthorConfig, } -#[derive(Clone, Debug, Default, Deserialize, PartialEq)] -pub struct LogConfig { - pub level: Option, -} - #[derive(Clone, Debug, Default, Deserialize, PartialEq)] pub struct CliConfig { pub mode: Option, @@ -56,7 +51,8 @@ pub struct CliConfig { pub exec: Option, pub llm: Option, pub git: Option, - pub log: Option, + #[serde(default)] + pub log: arc_api::server_config::LogConfig, } #[derive(Debug, PartialEq)] @@ -360,10 +356,7 @@ email = "me@local" fn parse_log_level() { let toml = "[log]\nlevel = \"debug\""; let config: CliConfig = toml::from_str(toml).unwrap(); - assert_eq!( - config.log.unwrap().level.as_deref(), - Some("debug") - ); + assert_eq!(config.log.level.as_deref(), Some("debug")); } #[test] diff --git a/crates/arc-cli/src/main.rs b/crates/arc-cli/src/main.rs index 930683c0f..eee20a228 100644 --- a/crates/arc-cli/src/main.rs +++ b/crates/arc-cli/src/main.rs @@ -143,7 +143,7 @@ async fn main() -> Result<()> { server_config.log.level } else { let cli_config = cli_config::load_cli_config(None)?; - cli_config.log.and_then(|l| l.level) + cli_config.log.level }; let log_prefix = if command_name == "serve" { "serve" } else { "cli" };