From 71513afc87a0230cf649d6c027a265c94c1acd6e Mon Sep 17 00:00:00 2001 From: tison Date: Sun, 26 Oct 2025 11:44:54 +0800 Subject: [PATCH] chore: critial to crit Signed-off-by: tison --- CHANGELOG.md | 4 ++-- appenders/journald/src/lib.rs | 2 +- appenders/opentelemetry/src/lib.rs | 2 +- appenders/syslog/src/lib.rs | 2 +- core/src/filter/env_filter/tests.rs | 7 +------ core/src/record.rs | 6 +++--- layouts/text/src/lib.rs | 8 ++++---- 7 files changed, 13 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea2cb35..0761691 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/appenders/journald/src/lib.rs b/appenders/journald/src/lib.rs index 03efe94..60f6fc8 100644 --- a/appenders/journald/src/lib.rs +++ b/appenders/journald/src/lib.rs @@ -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", diff --git a/appenders/opentelemetry/src/lib.rs b/appenders/opentelemetry/src/lib.rs index 456a5c1..ae913fe 100644 --- a/appenders/opentelemetry/src/lib.rs +++ b/appenders/opentelemetry/src/lib.rs @@ -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, diff --git a/appenders/syslog/src/lib.rs b/appenders/syslog/src/lib.rs index 6b25bee..575f8d1 100644 --- a/appenders/syslog/src/lib.rs +++ b/appenders/syslog/src/lib.rs @@ -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, diff --git a/core/src/filter/env_filter/tests.rs b/core/src/filter/env_filter/tests.rs index c8f6dc4..10dddec 100644 --- a/core/src/filter/env_filter/tests.rs +++ b/core/src/filter/env_filter/tests.rs @@ -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 => (), } } diff --git a/core/src/record.rs b/core/src/record.rs index dd478f4..a8cc80a 100644 --- a/core/src/record.rs +++ b/core/src/record.rs @@ -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. @@ -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", @@ -501,7 +501,7 @@ impl FromStr for Level { type Err = Error; fn from_str(s: &str) -> Result { for (name, level) in [ - ("critical", Level::Critical), + ("crit", Level::Crit), ("error", Level::Error), ("warn", Level::Warn), ("info", Level::Info), diff --git a/layouts/text/src/lib.rs b/layouts/text/src/lib.rs index 79afbc4..e3f58e2 100644 --- a/layouts/text/src/lib.rs +++ b/layouts/text/src/lib.rs @@ -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. @@ -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, @@ -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,