No longer require Sink::log to call should_log to filter records

Author: SpriteOvO

spdlog/benches/spdlog-rs/pattern.rs

@@ -50,11 +50,11 @@ impl<F: Formatter> Sink for BenchSink<F> {
         unimplemented!()
     }
 
-    fn level_filter(&self) -> spdlog::LevelFilter {
-        unimplemented!()
+    fn level_filter(&self) -> LevelFilter {
+        LevelFilter::All
     }
 
-    fn set_level_filter(&self, _level_filter: spdlog::LevelFilter) {
+    fn set_level_filter(&self, _level_filter: LevelFilter) {
         unimplemented!()
     }
 

spdlog/src/logger.rs

@@ -389,8 +389,10 @@ impl Logger {
 
     fn sink_record(&self, record: &Record) {
         self.sinks.iter().for_each(|sink| {
-            if let Err(err) = sink.log(record) {
-                self.handle_error(err);
+            if sink.should_log(record.level()) {
+                if let Err(err) = sink.log(record) {
+                    self.handle_error(err);
+                }
             }
         });
 

spdlog/src/sink/async_sink/async_pool_sink.rs

@@ -68,13 +68,10 @@ impl AsyncPoolSink {
 
 impl Sink for AsyncPoolSink {
     fn log(&self, record: &Record) -> Result<()> {
-        if self.should_log(record.level()) {
-            self.assign_task(Task::Log {
-                backend: self.clone_backend(),
-                record: record.to_owned(),
-            })?;
-        }
-        Ok(())
+        self.assign_task(Task::Log {
+            backend: self.clone_backend(),
+            record: record.to_owned(),
+        })
     }
 
     fn flush(&self) -> Result<()> {

spdlog/src/sink/file_sink.rs

@@ -63,10 +63,6 @@ impl FileSink {
 
 impl Sink for FileSink {
     fn log(&self, record: &Record) -> Result<()> {
-        if !self.should_log(record.level()) {
-            return Ok(());
-        }
-
         let mut string_buf = StringBuf::new();
         self.common_impl
             .formatter

spdlog/src/sink/journald_sink.rs

@@ -105,10 +105,6 @@ impl JournaldSink {
 
 impl Sink for JournaldSink {
     fn log(&self, record: &Record) -> Result<()> {
-        if !self.should_log(record.level()) {
-            return Ok(());
-        }
-
         let mut string_buf = StringBuf::new();
         self.common_impl
             .formatter

spdlog/src/sink/mod.rs

@@ -87,9 +87,6 @@ pub trait Sink: Sync + Send {
     }
 
     /// Logs a record.
-    ///
-    /// Implementors should always call [`Sink::should_log`] internally to
-    /// filter records.
     fn log(&self, record: &Record) -> Result<()>;
 
     /// Flushes any buffered records.

spdlog/src/sink/rotating_file_sink.rs

@@ -286,10 +286,6 @@ impl RotatingFileSink {
 
 impl Sink for RotatingFileSink {
     fn log(&self, record: &Record) -> Result<()> {
-        if !self.should_log(record.level()) {
-            return Ok(());
-        }
-
         let mut string_buf = StringBuf::new();
         self.common_impl
             .formatter

spdlog/src/sink/std_stream_sink.rs

@@ -143,10 +143,6 @@ impl StdStreamSink {
 
 impl Sink for StdStreamSink {
     fn log(&self, record: &Record) -> Result<()> {
-        if !self.should_log(record.level()) {
-            return Ok(());
-        }
-
         let mut string_buf = StringBuf::new();
         let extra_info = self
             .common_impl

spdlog/src/sink/win_debug_sink.rs

@@ -36,10 +36,6 @@ impl Sink for WinDebugSink {
         #[cfg(windows)] // https://github.com/rust-lang/rust/issues/97976
         use std::os::windows::ffi::OsStrExt;
 
-        if !self.should_log(record.level()) {
-            return Ok(());
-        }
-
         let mut string_buf = StringBuf::new();
         self.common_impl
             .formatter

spdlog/src/sink/write_sink.rs

@@ -85,10 +85,6 @@ where
     W: Write + Send,
 {
     fn log(&self, record: &Record) -> Result<()> {
-        if !self.should_log(record.level()) {
-            return Ok(());
-        }
-
         let mut string_buf = StringBuf::new();
         self.common_impl
             .formatter