From 6559c338f0c87260f3ad699d5ca5f702c454ad94 Mon Sep 17 00:00:00 2001
From: Yoo1tic <137816438+Yoo1tic@users.noreply.github.com>
Date: Sun, 10 Aug 2025 22:04:58 +0800
Subject: [PATCH] refactor: simplify logging setup and enhance progress bar
 display in validation service

---
 src/main.rs                          | 17 +++++------------
 src/validation/validation_service.rs |  4 ++--
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 3366948..ce7c052 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -3,7 +3,7 @@ use gemini_keychecker::{BANNER, config::KeyCheckerConfig, validation::start_vali
 use mimalloc::MiMalloc;
 use tracing::info;
 use tracing_indicatif::IndicatifLayer;
-use tracing_subscriber::Layer;
+use tracing_subscriber::EnvFilter;
 use tracing_subscriber::layer::SubscriberExt;
 use tracing_subscriber::util::SubscriberInitExt;
 
@@ -16,19 +16,12 @@ async fn main() -> Result<(), ValidatorError> {
     let config = KeyCheckerConfig::load_config()?;
 
     let indicatif_layer = IndicatifLayer::new();
+    let env_filter =
+        EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new(&config.log_level));
 
     tracing_subscriber::registry()
-        .with(
-            tracing_subscriber::fmt::layer()
-                .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(env_filter)
+        .with(tracing_subscriber::fmt::layer().with_writer(indicatif_layer.get_stderr_writer()))
         .with(indicatif_layer)
         .init();
 
diff --git a/src/validation/validation_service.rs b/src/validation/validation_service.rs
index e3363d1..56642a2 100644
--- a/src/validation/validation_service.rs
+++ b/src/validation/validation_service.rs
@@ -49,10 +49,10 @@ impl ValidationService {
             }
         });
         // 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(
             &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(),
         );