From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 24 Sep 2022 18:07:27 +0000 (+0100)
Subject: syslog: prep for printing level: Move max level handling
X-Git-Tag: hippotat/1.0.0~70
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=4d4f211c00414a3acd9bc84d5edd1ad2a6ac3fd5;p=hippotat.git

syslog: prep for printing level: Move max level handling

We're going to want to add a note to every message.  It makes sense to
use the same wrapper struct and give it more of the functionality.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/src/reporter.rs b/src/reporter.rs
index 0fdecd0..f4ab447 100644
--- a/src/reporter.rs
+++ b/src/reporter.rs
@@ -42,6 +42,14 @@ impl<T> LogWrapper<T> {
     };
     self.debug >= 2 || first(md.target()) == first(module_path!())
   }
+
+  fn set_max_level(&self) {
+    log::set_max_level(if self.debug < 1 {
+      log::LevelFilter::Debug
+    } else {
+      log::LevelFilter::Trace
+    });
+  }
 }
 
 impl<T> log::Log for LogWrapper<T> where T: log::Log {
@@ -77,13 +85,9 @@ impl LogOpts {
         .context("set up syslog logger")?;
       let l = syslog::BasicLogger::new(l);
       let l = LogWrapper { output: l, debug: self.debug };
+      l.set_max_level();
       let l = Box::new(l) as _;
       log::set_boxed_logger(l).context("install syslog logger")?;
-      log::set_max_level(if self.debug < 1 {
-        log::LevelFilter::Debug
-      } else {
-        log::LevelFilter::Trace
-      });
     } else {
       let env = env_logger::Env::new()
         .filter("HIPPOTAT_LOG")