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.

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

Add a method to Targets to get the default level #2242

Merged
merged 4 commits into from Jul 25, 2022
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
40 changes: 40 additions & 0 deletions tracing-subscriber/src/filter/targets.rs
Expand Up @@ -277,6 +277,31 @@ impl Targets {
self
}

/// Returns the explicitly set default level for this filter, if any.
///
hawkw marked this conversation as resolved.
Show resolved Hide resolved
/// If a default level was set explicitly using [`with_default`](Self::with_default), that level
/// will be returned. Otherwise `None` will be returned.
connec marked this conversation as resolved.
Show resolved Hide resolved
///
/// A return value of `None` is behaviourly equivalent to [`LevelFilter::OFF`], but
/// distinguishes between an explicitly set default level or the default one. If you only care
/// about the behaviour you can use `unwrap_or`:
connec marked this conversation as resolved.
Show resolved Hide resolved
///
/// ```
/// use tracing_subscriber::filter::{LevelFilter, Targets};
///
/// let filter = Targets::new();
/// let default_level = filter.default_level().unwrap_or(LevelFilter::OFF);
///
/// assert_eq!(default_level, LevelFilter::OFF);
/// ```
connec marked this conversation as resolved.
Show resolved Hide resolved
pub fn default_level(&self) -> Option<LevelFilter> {
self.0
.directives()
.into_iter()
.find(|d| d.target.is_none())
.map(|d| d.level)
connec marked this conversation as resolved.
Show resolved Hide resolved
}

/// Returns an iterator over the [target]-[`LevelFilter`] pairs in this filter.
///
/// The order of iteration is undefined.
Expand Down Expand Up @@ -685,6 +710,21 @@ mod tests {
);
}

#[test]
fn targets_default_level() {
let filter = expect_parse("crate1::mod1=error,crate1::mod2,crate2=debug,crate3=off");
assert_eq!(filter.default_level(), None);

let filter = expect_parse("crate1::mod1=error,crate1::mod2,crate2=debug,crate3=off")
.with_default(LevelFilter::OFF);
assert_eq!(filter.default_level(), Some(LevelFilter::OFF));

let filter = expect_parse("crate1::mod1=error,crate1::mod2,crate2=debug,crate3=off")
.with_default(LevelFilter::OFF)
.with_default(LevelFilter::INFO);
assert_eq!(filter.default_level(), Some(LevelFilter::INFO));
}

#[test]
// `println!` is only available with `libstd`.
#[cfg(feature = "std")]
Expand Down