Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(layers/logging): parsing level str #2160

Merged
merged 6 commits into from
Apr 29, 2023
Merged

refactor(layers/logging): parsing level str #2160

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b3b4a3a
refactor(layers/logging): parsing level str
PsiACE Apr 28, 2023
1c8b5b6
fix: make clippy happy
PsiACE Apr 28, 2023
5c52c2c
refactor(layer/logging): parse level must succeed
PsiACE Apr 29, 2023
73517b9
refactor(layer/logging): return reslut self
PsiACE Apr 29, 2023
4990d4e
refactor(layer/logging): return an error install panic
PsiACE Apr 29, 2023
74941b2
refactor(layer/logging): add input level to error context
PsiACE Apr 29, 2023
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
14 changes: 10 additions & 4 deletions core/src/layers/logging.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,11 @@ impl LoggingLayer {
/// `None` means disable the log for error.
pub fn with_error_level(mut self, level: Option<&str>) -> Result<Self> {
if let Some(level) = level {
let level = Level::from_str(level).expect("parse level must succeed");
self.error_level = Some(level);
if let Ok(level) = Level::from_str(level) {
PsiACE marked this conversation as resolved.
Show resolved Hide resolved
self.error_level = Some(level);
return Ok(self);
}
return Err(Error::new(ErrorKind::ConfigInvalid, "invalid log level"));
} else {
self.error_level = None;
}
Expand All @@ -123,8 +126,11 @@ impl LoggingLayer {
/// `None` means disable the log for failure.
pub fn with_failure_level(mut self, level: Option<&str>) -> Result<Self> {
if let Some(level) = level {
let level = Level::from_str(level).expect("parse level must succeed");
self.failure_level = Some(level);
if let Ok(level) = Level::from_str(level) {
self.failure_level = Some(level);
return Ok(self);
}
return Err(Error::new(ErrorKind::ConfigInvalid, "invalid log level"));
} else {
self.failure_level = None;
}
Expand Down