Skip to content

Commit de97c75

Browse files
committed
feat: renamed stdout to console logger writer
1 parent 4a105e9 commit de97c75

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

src/config.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ impl Default for LogConfig {
177177
LogConfig {
178178
level: 0,
179179
format: LogFormatConfig::default(),
180-
writers: vec![LogWriterConfig::Stdout(LogConsoleWriterConfig::default())],
180+
writers: vec![LogWriterConfig::Console(LogConsoleWriterConfig::default())],
181181
config_path: None,
182182
}
183183
}
@@ -196,7 +196,7 @@ pub struct LogFormatConfig {
196196
#[derive(Deserialize, Debug, Clone)]
197197
#[serde(rename_all = "snake_case")]
198198
pub enum LogWriterConfig {
199-
Stdout(LogConsoleWriterConfig),
199+
Console(LogConsoleWriterConfig),
200200
File(LogFileWriterConfig),
201201
}
202202

@@ -312,7 +312,7 @@ mod tests {
312312
assert!(!config.log.format.without_time);
313313
// default writer configuration should contain a stdout writer
314314
assert_eq!(config.log.writers.len(), 1);
315-
if let LogWriterConfig::Stdout(stdout_config) = &config.log.writers[0] {
315+
if let LogWriterConfig::Console(stdout_config) = &config.log.writers[0] {
316316
assert_eq!(stdout_config.level, None);
317317
assert_eq!(stdout_config.format.without_time, None);
318318
} else {
@@ -415,13 +415,13 @@ mod tests {
415415
}
416416
}
417417
#[test]
418-
fn test_deser_stdout_writer_full() {
418+
fn test_deser_console_writer_full() {
419419
let config_str = r#"
420420
{
421421
"log": {
422422
"writers": [
423423
{
424-
"stdout": {
424+
"console": {
425425
"level": 1,
426426
"format": {
427427
"without_time": false
@@ -436,24 +436,24 @@ mod tests {
436436
#[cfg(feature = "logging")]
437437
{
438438
assert_eq!(config.log.writers.len(), 1);
439-
if let LogWriterConfig::Stdout(stdout_config) = &config.log.writers[0] {
439+
if let LogWriterConfig::Console(stdout_config) = &config.log.writers[0] {
440440
assert_eq!(stdout_config.level, Some(1));
441441
assert_eq!(stdout_config.format.without_time, Some(false));
442442
} else {
443-
panic!("Expected a stdout writer configuration");
443+
panic!("Expected a console writer configuration");
444444
}
445445
}
446446
}
447447

448448
#[test]
449-
fn test_deser_stdout_writer_minimal() {
450-
// Minimal valid stdout writer configuration
449+
fn test_deser_console_writer_minimal() {
450+
// Minimal valid console writer configuration
451451
let config_str = r#"
452452
{
453453
"log": {
454454
"writers": [
455455
{
456-
"stdout": {}
456+
"console": {}
457457
}
458458
]
459459
}
@@ -463,11 +463,11 @@ mod tests {
463463
#[cfg(feature = "logging")]
464464
{
465465
assert_eq!(config.log.writers.len(), 1);
466-
if let LogWriterConfig::Stdout(stdout_config) = &config.log.writers[0] {
466+
if let LogWriterConfig::Console(stdout_config) = &config.log.writers[0] {
467467
assert_eq!(stdout_config.level, None);
468468
assert_eq!(stdout_config.format.without_time, None);
469469
} else {
470-
panic!("Expected a stdout writer configuration");
470+
panic!("Expected a console writer configuration");
471471
}
472472
}
473473
}

src/logging/tracing.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
use std::io;
44
use std::io::IsTerminal;
55

6-
use time::format_description::well_known::Rfc3339;
76
use time::UtcOffset;
7+
use time::format_description::well_known::Rfc3339;
88
use tracing::level_filters::LevelFilter;
99
use tracing_appender::rolling::{InitError, RollingFileAppender};
10-
use tracing_subscriber::fmt::time::OffsetTime;
1110
use tracing_subscriber::fmt::MakeWriter;
11+
use tracing_subscriber::fmt::time::OffsetTime;
1212
use tracing_subscriber::layer::SubscriberExt;
1313
use tracing_subscriber::util::SubscriberInitExt;
14-
use tracing_subscriber::{fmt, EnvFilter, Layer, Registry};
14+
use tracing_subscriber::{EnvFilter, Layer, Registry, fmt};
1515

1616
use crate::config::{
1717
LogConfig, LogConsoleWriterConfig, LogFileWriterConfig, LogFormatConfig, LogFormatConfigOverride, LogWriterConfig,
@@ -36,7 +36,7 @@ trait MakeLayer {
3636
impl MakeLayer for LogWriterConfig {
3737
fn make_layer(&self, bin_name: &str, global: &LogConfig) -> BoxedLayer {
3838
match self {
39-
LogWriterConfig::Stdout(console_config) => console_config.make_layer(bin_name, global),
39+
LogWriterConfig::Console(console_config) => console_config.make_layer(bin_name, global),
4040
LogWriterConfig::File(file_config) => file_config.make_layer(bin_name, global),
4141
}
4242
}

0 commit comments

Comments
 (0)