Skip to content
Merged
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
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ All notable changes to this project will be documented in this file.
### Breaking changes

* Rename `DefaultTrap` to `BestEffortTrap` for better clarity.
* Add `Level::Critical` variant to represent critical level logs.
* Redesign `LevelFilter`.
* Add `Level::Crit` variant to represent critical level logs.
* Redesign `LevelFilter` to allow different comparison methods.

### New features

Expand Down
2 changes: 1 addition & 1 deletion appenders/journald/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ impl Append for Journald {
// write them directly, everything else goes through the put functions
// for property mangling and length-encoding
let priority = match record.level() {
Level::Critical => b"2",
Level::Crit => b"2",
Level::Error => b"3",
Level::Warn => b"4",
Level::Info => b"5",
Expand Down
2 changes: 1 addition & 1 deletion appenders/opentelemetry/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ impl Drop for OpentelemetryLog {

fn log_level_to_otel_severity(level: Level) -> opentelemetry::logs::Severity {
match level {
Level::Critical => opentelemetry::logs::Severity::Fatal,
Level::Crit => opentelemetry::logs::Severity::Fatal,
Level::Error => opentelemetry::logs::Severity::Error,
Level::Warn => opentelemetry::logs::Severity::Warn,
Level::Info => opentelemetry::logs::Severity::Info,
Expand Down
2 changes: 1 addition & 1 deletion appenders/syslog/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ struct SyslogFormatter {

fn log_level_to_syslog_severity(level: Level) -> fasyslog::Severity {
match level {
Level::Critical => fasyslog::Severity::CRITICAL,
Level::Crit => fasyslog::Severity::CRITICAL,
Level::Error => fasyslog::Severity::ERROR,
Level::Warn => fasyslog::Severity::WARNING,
Level::Info => fasyslog::Severity::NOTICE,
Expand Down
7 changes: 1 addition & 6 deletions core/src/filter/env_filter/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -361,12 +361,7 @@ fn filter_beginning_longest_match() {
fn ensure_tests_cover_level_universe() {
let level_universe: Level = Level::Trace; // use of trace variant is arbitrary
match level_universe {
Level::Critical
| Level::Error
| Level::Warn
| Level::Info
| Level::Debug
| Level::Trace => (),
Level::Crit | Level::Error | Level::Warn | Level::Info | Level::Debug | Level::Trace => (),
}
}

Expand Down
6 changes: 3 additions & 3 deletions core/src/record.rs
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ impl RecordOwned {
#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
pub enum Level {
/// Designates critical errors.
Critical,
Crit,
/// Designates very serious errors.
Error,
/// Designates hazardous situations.
Expand All @@ -422,7 +422,7 @@ impl Level {
/// This returns the same string as the `fmt::Display` implementation.
pub fn as_str(&self) -> &'static str {
match self {
Level::Critical => "CRITICAL",
Level::Crit => "CRIT",
Level::Error => "ERROR",
Level::Warn => "WARN",
Level::Info => "INFO",
Expand Down Expand Up @@ -501,7 +501,7 @@ impl FromStr for Level {
type Err = Error;
fn from_str(s: &str) -> Result<Level, Self::Err> {
for (name, level) in [
("critical", Level::Critical),
("crit", Level::Crit),
("error", Level::Error),
("warn", Level::Warn),
("info", Level::Info),
Expand Down
8 changes: 4 additions & 4 deletions layouts/text/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,8 @@ impl Layout for TextLayout {
/// Colors for different log levels.
#[derive(Debug, Clone)]
struct LevelColor {
/// Color for critical level logs.
critical: Color,
/// Color for crit level logs.
crit: Color,
/// Color for error level logs.
error: Color,
/// Color for warning level logs.
Expand All @@ -195,7 +195,7 @@ struct LevelColor {
impl Default for LevelColor {
fn default() -> Self {
Self {
critical: Color::BrightRed,
crit: Color::BrightRed,
error: Color::Red,
warn: Color::Yellow,
info: Color::Green,
Expand All @@ -212,7 +212,7 @@ impl LevelColor {
ColoredString::from(level.to_string())
} else {
let color = match level {
Level::Critical => self.critical,
Level::Crit => self.crit,
Level::Error => self.error,
Level::Warn => self.warn,
Level::Info => self.info,
Expand Down
Loading