GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2026-09-13 02:54:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: 简化日志级别配置并移除 verbose 参数

Browse Source
This commit is contained in:
mofeng-git
2026-08-26 11:04:40 +08:00
parent 37af369b43
commit 486f3887c2
1 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/main.rs
View File

@@ -24,7 +24,6 @@ enum LogLevel {
Warn, Warn,
#[default] #[default]
Info, Info,
Verbose,
Debug, Debug,
Trace, Trace,
} }
@@ -70,13 +69,9 @@ struct CliArgs {
#[arg(short = 'd', long, value_name = "DIR")] #[arg(short = 'd', long, value_name = "DIR")]
data_dir: Option<PathBuf>, data_dir: Option<PathBuf>,
/// Log level (error, warn, info, verbose, debug, trace) /// Log level (error, warn, info, debug, trace)
#[arg(short = 'l', long, value_name = "LEVEL", default_value = "info")] #[arg(short = 'l', long, value_name = "LEVEL", default_value = "info")]
log_level: LogLevel, log_level: LogLevel,
/// Increase verbosity (-v for verbose, -vv for debug, -vvv for trace)
#[arg(short = 'v', long, action = clap::ArgAction::Count)]
verbose: u8,
} }
#[derive(Subcommand, Debug)] #[derive(Subcommand, Debug)]
@@ -103,7 +98,7 @@ enum UserAction {
async fn main() -> anyhow::Result<()> { async fn main() -> anyhow::Result<()> {
let args = CliArgs::parse(); let args = CliArgs::parse();
init_logging(args.log_level, args.verbose); init_logging(args.log_level);
CryptoProvider::install_default(ring::default_provider()) CryptoProvider::install_default(ring::default_provider())
.expect("Failed to install rustls crypto provider"); .expect("Failed to install rustls crypto provider");
@@ -244,25 +239,16 @@ async fn main() -> anyhow::Result<()> {
Ok(()) Ok(())
} }
fn init_logging(level: LogLevel, verbose_count: u8) { fn init_logging(level: LogLevel) {
let effective_level = match verbose_count { let app_level = match level {
0 => level, LogLevel::Error => "error",
1 => LogLevel::Verbose, LogLevel::Warn => "warn",
2 => LogLevel::Debug, LogLevel::Info => "info",
_ => LogLevel::Trace, LogLevel::Debug => "debug",
LogLevel::Trace => "trace",
}; };
let filter = match effective_level {
LogLevel::Error => "one_kvm=error,tower_http=error,webrtc_sctp=warn",
LogLevel::Warn => "one_kvm=warn,tower_http=warn,webrtc_sctp=warn",
LogLevel::Info => "one_kvm=info,tower_http=info,webrtc_sctp=warn",
LogLevel::Verbose => "one_kvm=debug,tower_http=info,webrtc_sctp=warn",
LogLevel::Debug => "one_kvm=debug,tower_http=debug,webrtc_sctp=warn",
LogLevel::Trace => "one_kvm=trace,tower_http=debug,webrtc_sctp=warn",
};
let env_filter = let env_filter =
tracing_subscriber::EnvFilter::try_from_default_env().unwrap_or_else(|_| filter.into()); tracing_subscriber::EnvFilter::try_from_default_env().unwrap_or_else(|_| app_level.into());
if let Err(err) = tracing_subscriber::registry() if let Err(err) = tracing_subscriber::registry()
.with(env_filter) .with(env_filter)