mirror of
https://github.com/fabro-sh/fabro.git
synced 2026-09-06 08:18:58 +00:00
Reuse server_config::LogConfig in CLI instead of duplicate struct
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
a1fb96c08a
commit
15a8eed5dc
2 changed files with 4 additions and 11 deletions
|
|
@ -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<String>,
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug, Default, Deserialize, PartialEq)]
|
||||
pub struct CliConfig {
|
||||
pub mode: Option<ExecutionMode>,
|
||||
|
|
@ -56,7 +51,8 @@ pub struct CliConfig {
|
|||
pub exec: Option<ExecDefaults>,
|
||||
pub llm: Option<LlmDefaults>,
|
||||
pub git: Option<CliGitConfig>,
|
||||
pub log: Option<LogConfig>,
|
||||
#[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]
|
||||
|
|
|
|||
|
|
@ -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" };
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue