增加日志信息控制

Author: Boomboomdunce

README.md

@@ -48,13 +48,18 @@ docker run --rm -v /path/to/emails:/data rsendmail --smtp-server <smtp_server> -
 - `--processes`: Number of processes, "auto" for CPU core count or specify a number (default: auto)
 - `--batch-size`: Number of emails to send in a single SMTP session (default: 1)
 - `--smtp-timeout`: SMTP session timeout in seconds (default: 30)
+- `--log-level`: Log level (error/warn/info/debug/trace) (default: info)
 
 ## Example
 
 ```bash
 # Local example
+# Normal logging (info level)
 rsendmail --smtp-server 192.168.1.100 --port 25 --from sender@example.com --to recipient@example.com --dir ./emails --processes 10 --batch-size 5
 
+# Detailed debug logging
+rsendmail --smtp-server 192.168.1.100 --port 25 --from sender@example.com --to recipient@example.com --dir ./emails --processes 10 --batch-size 5 --log-level debug
+
 # Docker example
 docker run --rm -v $(pwd)/emails:/data rsendmail --smtp-server 192.168.1.100 --port 25 --from sender@example.com --to recipient@example.com --dir /data --processes 10 --batch-size 5
 ```

rsendmail/src/config.rs

@@ -1,4 +1,5 @@
 use clap::Parser;
+use log::LevelFilter;
 
 /// A high-performance bulk email sending CLI tool
 #[derive(Parser, Debug, Clone)]
@@ -39,6 +40,10 @@ pub struct Config {
     /// SMTP会话超时时间（秒）
     #[arg(long, default_value_t = 30)]
     pub smtp_timeout: u64,
+
+    /// 日志级别 (error/warn/info/debug/trace)
+    #[arg(long, default_value = "info")]
+    pub log_level: String,
 }
 
 #[derive(Debug, PartialEq)]
@@ -48,6 +53,17 @@ pub enum ProcessMode {
 }
 
 impl Config {
+    pub fn get_log_level(&self) -> LevelFilter {
+        match self.log_level.to_lowercase().as_str() {
+            "error" => LevelFilter::Error,
+            "warn" => LevelFilter::Warn,
+            "info" => LevelFilter::Info,
+            "debug" => LevelFilter::Debug,
+            "trace" => LevelFilter::Trace,
+            _ => LevelFilter::Info,
+        }
+    }
+
     pub fn process_mode(&self) -> ProcessMode {
         if self.processes == "auto" {
             ProcessMode::Auto

rsendmail/src/mailer.rs

@@ -72,8 +72,19 @@ impl Mailer {
                             group_stats.2 += send_duration;
                         }
                         Err(e) => {
-                            error!("进程组 {} 文件 {} 发送失败: {}", i + 1, j + 1, e);
-                            group_stats.3.push((e.to_string(), file.clone()));
+                            let error_type = if e.to_string().contains("parse") {
+                                "解析错误"
+                            } else if e.to_string().contains("timeout") {
+                                "连接超时"
+                            } else if e.to_string().contains("authentication") {
+                                "认证失败"
+                            } else if e.to_string().contains("connection refused") {
+                                "连接被拒绝"
+                            } else {
+                                "其他错误"
+                            };
+                            error!("进程组 {} 文件 {} 发送失败 - {}: {}", i + 1, j + 1, error_type, e);
+                            group_stats.3.push((error_type.to_string(), file.clone()));
                         }
                     }
                 }

rsendmail/src/main.rs

@@ -13,8 +13,14 @@ use std::process;
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
+    // 解析命令行参数
+    let config = Config::parse();
+
     // 初始化日志
-    env_logger::Builder::from_env(Env::default().default_filter_or("info")).init();
+    env_logger::Builder::from_env(Env::default())
+        .filter_level(config.get_log_level())
+        .format_timestamp_millis()
+        .init();
 
     // 创建一个原子布尔值用于控制程序退出
     let running = Arc::new(AtomicBool::new(true));
@@ -26,8 +32,7 @@ async fn main() -> anyhow::Result<()> {
         r.store(false, Ordering::SeqCst);
     })?;
 
-    // 解析命令行参数
-    let config = Config::parse();
+    // 配置已在上面解析
 
     // 创建邮件发送器
     let mailer = Mailer::new(config);

rsendmail/src/stats.rs

@@ -71,18 +71,28 @@ impl Stats {
 
 impl fmt::Display for Stats {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        writeln!(f, "邮件发送统计报告")?;
+        writeln!(f, "===================")?;
+        writeln!(f, "1. 基本统计")?;
         writeln!(f, "    总计处理: {} 封邮件", self.email_count)?;
         writeln!(f, "    成功发送: {} 封", self.email_count - self.send_errors - self.parse_errors)?;
-        writeln!(f, "    解析失败: {} 封", self.parse_errors)?;
-        writeln!(f, "    发送失败: {} 封", self.send_errors)?;
+        writeln!(f, "    总计失败: {} 封", self.send_errors + self.parse_errors)?;
 
         if !self.error_details.is_empty() {
-            writeln!(f, "    发送失败详情:")?;
-            for (error_type, count) in &self.error_details {
-                writeln!(f, "        {}: {} 封", error_type, count)?;
+            writeln!(f, "\n2. 错误分类统计")?;
+            let mut sorted_errors: Vec<_> = self.error_details.iter().collect();
+            sorted_errors.sort_by(|a, b| b.1.cmp(a.1));
+            
+            for (error_type, count) in sorted_errors {
+                writeln!(f, "    {} - {} 封 ({:.1}%)", 
+                    error_type, 
+                    count, 
+                    (*count as f64 / self.email_count as f64) * 100.0
+                )?;
                 if let Some(files) = self.failed_files.get(error_type) {
+                    writeln!(f, "    失败文件列表:")?;
                     for file in files {
-                        writeln!(f, "            - {}", file)?;
+                        writeln!(f, "        - {}", file)?;
                     }
                 }
             }