maye
/
gemini-keychecker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: simplify logging setup and enhance progress bar display in validation service

main
Yoo1tic 2025-08-10 22:04:58 +08:00
parent 97e07920dc
commit 6559c338f0
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main.rs
View File

@ -3,7 +3,7 @@ use gemini_keychecker::{BANNER, config::KeyCheckerConfig, validation::start_vali
use mimalloc::MiMalloc; use mimalloc::MiMalloc;
use tracing::info; use tracing::info;
use tracing_indicatif::IndicatifLayer; use tracing_indicatif::IndicatifLayer;
use tracing_subscriber::Layer; use tracing_subscriber::EnvFilter;
use tracing_subscriber::layer::SubscriberExt; use tracing_subscriber::layer::SubscriberExt;
use tracing_subscriber::util::SubscriberInitExt; use tracing_subscriber::util::SubscriberInitExt;
@ -16,19 +16,12 @@ async fn main() -> Result<(), ValidatorError> {
let config = KeyCheckerConfig::load_config()?; let config = KeyCheckerConfig::load_config()?;
let indicatif_layer = IndicatifLayer::new(); let indicatif_layer = IndicatifLayer::new();
let env_filter =
EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new(&config.log_level));
tracing_subscriber::registry() tracing_subscriber::registry()
.with( .with(env_filter)
tracing_subscriber::fmt::layer() .with(tracing_subscriber::fmt::layer().with_writer(indicatif_layer.get_stderr_writer()))
.with_target(false)
.with_level(true)
.with_writer(indicatif_layer.get_stderr_writer())
.with_ansi(false)
.with_filter(
tracing_subscriber::EnvFilter::try_from_default_env()
.unwrap_or_else(|_| tracing_subscriber::EnvFilter::new(&config.log_level)),
),
)
.with(indicatif_layer) .with(indicatif_layer)
.init(); .init();

4
src/validation/validation_service.rs
View File

@ -49,10 +49,10 @@ impl ValidationService {
} }
}); });
// Create a progress bar to track validation progress // Create a progress bar to track validation progress
let progress_span = info_span!("progress_bar"); let progress_span = info_span!("key_checker");
progress_span.pb_set_style( progress_span.pb_set_style(
&ProgressStyle::with_template( &ProgressStyle::with_template(
"[{bar:60.cyan/blue}] {pos}/{len} ({percent}%) [{elapsed_precise}] ETA:{eta}", "[{bar:60.cyan/blue}] {pos}/{len} ({percent}%) [{elapsed_precise}] ETA:{eta} Speed:{per_sec}",
) )
.unwrap(), .unwrap(),
); );