Skip to content

Commit 41a327b

Browse files
authored
chore: critical to crit (#192)
Signed-off-by: tison <[email protected]>
1 parent 2ed037c commit 41a327b

File tree

7 files changed

+13
-18
lines changed

7 files changed

+13
-18
lines changed

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ All notable changes to this project will be documented in this file.
77
### Breaking changes
88

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

1313
### New features
1414

appenders/journald/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ impl Append for Journald {
255255
// write them directly, everything else goes through the put functions
256256
// for property mangling and length-encoding
257257
let priority = match record.level() {
258-
Level::Critical => b"2",
258+
Level::Crit => b"2",
259259
Level::Error => b"3",
260260
Level::Warn => b"4",
261261
Level::Info => b"5",

appenders/opentelemetry/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ impl Drop for OpentelemetryLog {
285285

286286
fn log_level_to_otel_severity(level: Level) -> opentelemetry::logs::Severity {
287287
match level {
288-
Level::Critical => opentelemetry::logs::Severity::Fatal,
288+
Level::Crit => opentelemetry::logs::Severity::Fatal,
289289
Level::Error => opentelemetry::logs::Severity::Error,
290290
Level::Warn => opentelemetry::logs::Severity::Warn,
291291
Level::Info => opentelemetry::logs::Severity::Info,

appenders/syslog/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ struct SyslogFormatter {
324324

325325
fn log_level_to_syslog_severity(level: Level) -> fasyslog::Severity {
326326
match level {
327-
Level::Critical => fasyslog::Severity::CRITICAL,
327+
Level::Crit => fasyslog::Severity::CRITICAL,
328328
Level::Error => fasyslog::Severity::ERROR,
329329
Level::Warn => fasyslog::Severity::WARNING,
330330
Level::Info => fasyslog::Severity::NOTICE,

core/src/filter/env_filter/tests.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -361,12 +361,7 @@ fn filter_beginning_longest_match() {
361361
fn ensure_tests_cover_level_universe() {
362362
let level_universe: Level = Level::Trace; // use of trace variant is arbitrary
363363
match level_universe {
364-
Level::Critical
365-
| Level::Error
366-
| Level::Warn
367-
| Level::Info
368-
| Level::Debug
369-
| Level::Trace => (),
364+
Level::Crit | Level::Error | Level::Warn | Level::Info | Level::Debug | Level::Trace => (),
370365
}
371366
}
372367

core/src/record.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ impl RecordOwned {
403403
#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
404404
pub enum Level {
405405
/// Designates critical errors.
406-
Critical,
406+
Crit,
407407
/// Designates very serious errors.
408408
Error,
409409
/// Designates hazardous situations.
@@ -422,7 +422,7 @@ impl Level {
422422
/// This returns the same string as the `fmt::Display` implementation.
423423
pub fn as_str(&self) -> &'static str {
424424
match self {
425-
Level::Critical => "CRITICAL",
425+
Level::Crit => "CRIT",
426426
Level::Error => "ERROR",
427427
Level::Warn => "WARN",
428428
Level::Info => "INFO",
@@ -501,7 +501,7 @@ impl FromStr for Level {
501501
type Err = Error;
502502
fn from_str(s: &str) -> Result<Level, Self::Err> {
503503
for (name, level) in [
504-
("critical", Level::Critical),
504+
("crit", Level::Crit),
505505
("error", Level::Error),
506506
("warn", Level::Warn),
507507
("info", Level::Info),

layouts/text/src/lib.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,8 @@ impl Layout for TextLayout {
178178
/// Colors for different log levels.
179179
#[derive(Debug, Clone)]
180180
struct LevelColor {
181-
/// Color for critical level logs.
182-
critical: Color,
181+
/// Color for crit level logs.
182+
crit: Color,
183183
/// Color for error level logs.
184184
error: Color,
185185
/// Color for warning level logs.
@@ -195,7 +195,7 @@ struct LevelColor {
195195
impl Default for LevelColor {
196196
fn default() -> Self {
197197
Self {
198-
critical: Color::BrightRed,
198+
crit: Color::BrightRed,
199199
error: Color::Red,
200200
warn: Color::Yellow,
201201
info: Color::Green,
@@ -212,7 +212,7 @@ impl LevelColor {
212212
ColoredString::from(level.to_string())
213213
} else {
214214
let color = match level {
215-
Level::Critical => self.critical,
215+
Level::Crit => self.crit,
216216
Level::Error => self.error,
217217
Level::Warn => self.warn,
218218
Level::Info => self.info,

0 commit comments

Comments
 (0)