Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
target
Cargo.lock
*.log
.idea
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ pub use self::config::{
pub use self::loggers::TestLogger;
pub use self::loggers::{CombinedLogger, SimpleLogger, WriteLogger};
#[cfg(feature = "termcolor")]
pub use self::loggers::{TermLogger, TerminalMode};
pub use self::loggers::{Target, TermLogger, TerminalMode};
#[cfg(feature = "termcolor")]
pub use termcolor::{Color, ColorChoice};

Expand Down
2 changes: 1 addition & 1 deletion src/loggers/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ mod writelog;
pub use self::comblog::CombinedLogger;
pub use self::simplelog::SimpleLogger;
#[cfg(feature = "termcolor")]
pub use self::termlog::{TermLogger, TerminalMode};
pub use self::termlog::{Target, TermLogger, TerminalMode};
#[cfg(feature = "test")]
pub use self::testlog::TestLogger;
pub use self::writelog::WriteLogger;
61 changes: 55 additions & 6 deletions src/loggers/termlog.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,29 +19,77 @@ struct OutputStreams {
}

/// Specifies which streams should be used when logging
#[derive(Clone, Copy, PartialEq, Eq, Debug, Hash)]
#[derive(Clone, Copy, PartialEq, Eq, Debug, Hash, Default)]
pub enum TerminalMode {
/// Only use Stdout
Stdout,
/// Only use Stderr
Stderr,
/// Use Stderr for Errors and Stdout otherwise
#[default]
Mixed,
/// Use custom output streams
Custom {
/// Stream for Error logs
error: Target,
/// Stream for Warning logs
warn: Target,
/// Stream for Info logs
info: Target,
/// Stream for Debug logs
debug: Target,
/// Stream for Trace logs
trace: Target,
},
}

impl Default for TerminalMode {
fn default() -> TerminalMode {
TerminalMode::Mixed
impl TerminalMode {
/// Returns the target stream for the given log level
fn target(&self, level: Level) -> Target {
match self {
TerminalMode::Stdout => Target::Stdout,
TerminalMode::Stderr => Target::Stderr,
TerminalMode::Mixed => {
if level == Level::Error {
Target::Stderr
} else {
Target::Stdout
}
}
TerminalMode::Custom {
error,
warn,
info,
debug,
trace,
} => match level {
Level::Error => *error,
Level::Warn => *warn,
Level::Info => *info,
Level::Debug => *debug,
Level::Trace => *trace,
},
}
}
}

/// Possible target streams
#[derive(Clone, Copy, PartialEq, Eq, Debug, Hash)]
pub enum Target {
/// Use Stdout
Stdout,
/// Use Stderr
Stderr,
}

/// The TermLogger struct. Provides a stderr/out based Logger implementation
///
/// Supports colored output
pub struct TermLogger {
level: LevelFilter,
config: Config,
streams: Mutex<OutputStreams>,
mode: TerminalMode,
}

impl TermLogger {
Expand Down Expand Up @@ -113,7 +161,7 @@ impl TermLogger {
err: BufferedStandardStream::stderr(color_choice),
out: BufferedStandardStream::stderr(color_choice),
},
TerminalMode::Mixed => OutputStreams {
TerminalMode::Mixed | TerminalMode::Custom { .. } => OutputStreams {
err: BufferedStandardStream::stderr(color_choice),
out: BufferedStandardStream::stdout(color_choice),
},
Expand All @@ -123,6 +171,7 @@ impl TermLogger {
level: log_level,
config,
streams: Mutex::new(streams),
mode,
})
}

Expand Down Expand Up @@ -201,7 +250,7 @@ impl TermLogger {

let mut streams = self.streams.lock().unwrap();

if record.level() == Level::Error {
if self.mode.target(record.level()) == Target::Stderr {
self.try_log_term(record, &mut streams.err)
} else {
self.try_log_term(record, &mut streams.out)
Expand Down