Skip to content

Commit 4e0c80c

Browse files
author
Lenardt Gerhardts
committed
changed custom method for String to log::Level conversion to builtin method log::Level::from_str()
1 parent 7144f5f commit 4e0c80c

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed

src/render.rs

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ use serde_json::{json, Value};
5858
use std::borrow::Cow;
5959
use std::convert::TryFrom;
6060
use std::io::Write;
61+
use std::str::FromStr;
6162
use std::sync::Arc;
6263

6364
pub enum PageContext {
@@ -730,16 +731,6 @@ impl<W: std::io::Write> HtmlRenderContext<W> {
730731
component.starts_with(LOG_COMPONENT)
731732
}
732733

733-
fn string_to_log_level(log_level_string: &str) -> log::Level {
734-
match log_level_string {
735-
"error" => log::Level::Error,
736-
"warn" => log::Level::Warn,
737-
"trace" => log::Level::Trace,
738-
"debug" => log::Level::Debug,
739-
_ => log::Level::Info,
740-
}
741-
}
742-
743734
fn handle_log_component(data: &JsonValue) -> anyhow::Result<()> {
744735
let object_map: &serde_json::Map<String, JsonValue> = match data {
745736
JsonValue::Object(object) => object,
@@ -750,7 +741,11 @@ impl<W: std::io::Write> HtmlRenderContext<W> {
750741

751742
let log_level: log::Level = match object_map.get(LOG_PRIORITY_KEY) {
752743
Some(Value::String(priority)) => {
753-
Self::string_to_log_level(priority.clone().to_lowercase().as_str())
744+
if let Ok(level) = log::Level::from_str(&priority.clone()) {
745+
level
746+
} else {
747+
log::Level::Info
748+
}
754749
}
755750
_ => log::Level::Info,
756751
};

0 commit comments

Comments
 (0)