fmt: fix EnvFilter rejecting levels equal to the filter level (#75)

PR #72 introduced a bug in `EnvFilter` where spans and events whose level is _equal_ to the filter's max level are rejected, rather than accepted. This branch fixes the comparisons so that filters once again work as expected. Signed-off-by: Eliza Weisman <[email protected]>
tokio-rs · Jun 21, 2019 · 2bf7c61 · 2bf7c61
1 parent d74867e
commit 2bf7c61
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/tokio-trace-fmt/src/filter/env.rs b/tokio-trace-fmt/src/filter/env.rs
@@ -99,13 +99,13 @@ where
 
 impl<N> Filter<N> for EnvFilter {
     fn callsite_enabled(&self, metadata: &Metadata, _: &Context<N>) -> Interest {
-        if !self.includes_span_directive && self.max_level <= *metadata.level() {
+        if !self.includes_span_directive && self.max_level < *metadata.level() {
             return Interest::never();
         }
 
         let mut interest = Interest::never();
         for directive in self.directives_for(metadata) {
-            let accepts_level = directive.level > *metadata.level();
+            let accepts_level = directive.level >= *metadata.level();
             match directive.in_span.as_ref() {
                 // The directive applies to anything within the span described
                 // by this metadata. The span must always be enabled.
@@ -129,7 +129,7 @@ impl<N> Filter<N> for EnvFilter {
 
     fn enabled<'a>(&self, metadata: &Metadata, ctx: &Context<'a, N>) -> bool {
         for directive in self.directives_for(metadata) {
-            let accepts_level = directive.level > *metadata.level();
+            let accepts_level = directive.level >= *metadata.level();
             match directive.in_span.as_ref() {
                 // The directive applies to anything within the span described
                 // by this metadata. The span must always be enabled.