From de97c757d73f1e85feb46c6426fdda83bdb7a059 Mon Sep 17 00:00:00 2001 From: zonyitoo Date: Fri, 29 Aug 2025 01:20:38 +0800 Subject: [PATCH] feat: renamed stdout to console logger writer --- src/config.rs | 24 ++++++++++++------------ src/logging/tracing.rs | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/config.rs b/src/config.rs index cae5c75b..d8f89da7 100644 --- a/src/config.rs +++ b/src/config.rs @@ -177,7 +177,7 @@ impl Default for LogConfig { LogConfig { level: 0, format: LogFormatConfig::default(), - writers: vec![LogWriterConfig::Stdout(LogConsoleWriterConfig::default())], + writers: vec![LogWriterConfig::Console(LogConsoleWriterConfig::default())], config_path: None, } } @@ -196,7 +196,7 @@ pub struct LogFormatConfig { #[derive(Deserialize, Debug, Clone)] #[serde(rename_all = "snake_case")] pub enum LogWriterConfig { - Stdout(LogConsoleWriterConfig), + Console(LogConsoleWriterConfig), File(LogFileWriterConfig), } @@ -312,7 +312,7 @@ mod tests { assert!(!config.log.format.without_time); // default writer configuration should contain a stdout writer assert_eq!(config.log.writers.len(), 1); - if let LogWriterConfig::Stdout(stdout_config) = &config.log.writers[0] { + if let LogWriterConfig::Console(stdout_config) = &config.log.writers[0] { assert_eq!(stdout_config.level, None); assert_eq!(stdout_config.format.without_time, None); } else { @@ -415,13 +415,13 @@ mod tests { } } #[test] - fn test_deser_stdout_writer_full() { + fn test_deser_console_writer_full() { let config_str = r#" { "log": { "writers": [ { - "stdout": { + "console": { "level": 1, "format": { "without_time": false @@ -436,24 +436,24 @@ mod tests { #[cfg(feature = "logging")] { assert_eq!(config.log.writers.len(), 1); - if let LogWriterConfig::Stdout(stdout_config) = &config.log.writers[0] { + if let LogWriterConfig::Console(stdout_config) = &config.log.writers[0] { assert_eq!(stdout_config.level, Some(1)); assert_eq!(stdout_config.format.without_time, Some(false)); } else { - panic!("Expected a stdout writer configuration"); + panic!("Expected a console writer configuration"); } } } #[test] - fn test_deser_stdout_writer_minimal() { - // Minimal valid stdout writer configuration + fn test_deser_console_writer_minimal() { + // Minimal valid console writer configuration let config_str = r#" { "log": { "writers": [ { - "stdout": {} + "console": {} } ] } @@ -463,11 +463,11 @@ mod tests { #[cfg(feature = "logging")] { assert_eq!(config.log.writers.len(), 1); - if let LogWriterConfig::Stdout(stdout_config) = &config.log.writers[0] { + if let LogWriterConfig::Console(stdout_config) = &config.log.writers[0] { assert_eq!(stdout_config.level, None); assert_eq!(stdout_config.format.without_time, None); } else { - panic!("Expected a stdout writer configuration"); + panic!("Expected a console writer configuration"); } } } diff --git a/src/logging/tracing.rs b/src/logging/tracing.rs index 176bab63..42a1482d 100644 --- a/src/logging/tracing.rs +++ b/src/logging/tracing.rs @@ -3,15 +3,15 @@ use std::io; use std::io::IsTerminal; -use time::format_description::well_known::Rfc3339; use time::UtcOffset; +use time::format_description::well_known::Rfc3339; use tracing::level_filters::LevelFilter; use tracing_appender::rolling::{InitError, RollingFileAppender}; -use tracing_subscriber::fmt::time::OffsetTime; use tracing_subscriber::fmt::MakeWriter; +use tracing_subscriber::fmt::time::OffsetTime; use tracing_subscriber::layer::SubscriberExt; use tracing_subscriber::util::SubscriberInitExt; -use tracing_subscriber::{fmt, EnvFilter, Layer, Registry}; +use tracing_subscriber::{EnvFilter, Layer, Registry, fmt}; use crate::config::{ LogConfig, LogConsoleWriterConfig, LogFileWriterConfig, LogFormatConfig, LogFormatConfigOverride, LogWriterConfig, @@ -36,7 +36,7 @@ trait MakeLayer { impl MakeLayer for LogWriterConfig { fn make_layer(&self, bin_name: &str, global: &LogConfig) -> BoxedLayer { match self { - LogWriterConfig::Stdout(console_config) => console_config.make_layer(bin_name, global), + LogWriterConfig::Console(console_config) => console_config.make_layer(bin_name, global), LogWriterConfig::File(file_config) => file_config.make_layer(bin_name, global), } }