v0.25.5

src/logging/model.rs

@@ -261,7 +261,6 @@ fn source_value_name(name: &str) -> bool {
     )
 }
 
-
 #[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
 pub enum ErrorLogFormat {
     #[serde(rename = "JSON")]
@@ -270,7 +269,9 @@ pub enum ErrorLogFormat {
     Raw,
 }
 impl Default for ErrorLogFormat {
-    fn default() -> Self { Self::Json }
+    fn default() -> Self {
+        Self::Json
+    }
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -282,14 +283,20 @@ pub struct ErrorLogSettings {
 }
 impl Default for ErrorLogSettings {
     fn default() -> Self {
-        Self { enabled: false, path: "/var/log/rustproxy/error.log".into(), format: ErrorLogFormat::Json }
+        Self {
+            enabled: false,
+            path: "/var/log/rustproxy/error.log".into(),
+            format: ErrorLogFormat::Json,
+        }
     }
 }
 impl ErrorLogSettings {
     pub fn validate(&self) -> Result<()> {
         if self.enabled {
             ensure!(
-                !self.path.trim().is_empty() && self.path.len() <= 1024 && !self.path.chars().any(char::is_control),
+                !self.path.trim().is_empty()
+                    && self.path.len() <= 1024
+                    && !self.path.chars().any(char::is_control),
                 "error_log.path must be 1..1024 bytes without controls"
             );
         }
@@ -339,7 +346,14 @@ impl ErrorLogController {
             written.clone(),
             errors.clone(),
         ));
-        Arc::new(Self { settings, settings_changed, sender, dropped, written, errors })
+        Arc::new(Self {
+            settings,
+            settings_changed,
+            sender,
+            dropped,
+            written,
+            errors,
+        })
     }
     pub fn configure(&self, settings: ErrorLogSettings) {
         self.settings.store(Arc::new(settings));
@@ -363,10 +377,14 @@ impl ErrorLogController {
 static ERROR_LOG: OnceLock<Arc<ErrorLogController>> = OnceLock::new();
 
 pub fn install_error_log_controller(controller: Arc<ErrorLogController>) -> Result<()> {
-    ERROR_LOG.set(controller).map_err(|_| anyhow::anyhow!("error logger already initialized"))
+    ERROR_LOG
+        .set(controller)
+        .map_err(|_| anyhow::anyhow!("error logger already initialized"))
 }
 pub fn configure_error_log(settings: ErrorLogSettings) {
-    if let Some(controller) = ERROR_LOG.get() { controller.configure(settings); }
+    if let Some(controller) = ERROR_LOG.get() {
+        controller.configure(settings);
+    }
 }
 pub fn error_log_stats() -> Option<ErrorLogStats> {
     ERROR_LOG.get().map(|controller| controller.stats())
@@ -377,7 +395,9 @@ pub struct ErrorLogLayer {
     controller: Arc<ErrorLogController>,
 }
 impl ErrorLogLayer {
-    pub fn new(controller: Arc<ErrorLogController>) -> Self { Self { controller } }
+    pub fn new(controller: Arc<ErrorLogController>) -> Self {
+        Self { controller }
+    }
 }
 
 #[derive(Default)]
@@ -388,21 +408,42 @@ struct EventVisitor {
 impl tracing::field::Visit for EventVisitor {
     fn record_debug(&mut self, field: &tracing::field::Field, value: &dyn std::fmt::Debug) {
         let value = format!("{value:?}");
-        if field.name() == "message" { self.message = Some(value); }
-        else { self.fields.insert(field.name().to_owned(), value); }
+        if field.name() == "message" {
+            self.message = Some(value);
+        } else {
+            self.fields.insert(field.name().to_owned(), value);
+        }
     }
     fn record_str(&mut self, field: &tracing::field::Field, value: &str) {
-        if field.name() == "message" { self.message = Some(value.to_owned()); }
-        else { self.fields.insert(field.name().to_owned(), value.to_owned()); }
+        if field.name() == "message" {
+            self.message = Some(value.to_owned());
+        } else {
+            self.fields
+                .insert(field.name().to_owned(), value.to_owned());
+        }
+    }
+    fn record_i64(&mut self, field: &tracing::field::Field, value: i64) {
+        self.fields
+            .insert(field.name().to_owned(), value.to_string());
+    }
+    fn record_u64(&mut self, field: &tracing::field::Field, value: u64) {
+        self.fields
+            .insert(field.name().to_owned(), value.to_string());
+    }
+    fn record_bool(&mut self, field: &tracing::field::Field, value: bool) {
+        self.fields
+            .insert(field.name().to_owned(), value.to_string());
+    }
+    fn record_f64(&mut self, field: &tracing::field::Field, value: f64) {
+        self.fields
+            .insert(field.name().to_owned(), value.to_string());
     }
-    fn record_i64(&mut self, field: &tracing::field::Field, value: i64) { self.fields.insert(field.name().to_owned(), value.to_string()); }
-    fn record_u64(&mut self, field: &tracing::field::Field, value: u64) { self.fields.insert(field.name().to_owned(), value.to_string()); }
-    fn record_bool(&mut self, field: &tracing::field::Field, value: bool) { self.fields.insert(field.name().to_owned(), value.to_string()); }
-    fn record_f64(&mut self, field: &tracing::field::Field, value: f64) { self.fields.insert(field.name().to_owned(), value.to_string()); }
 }
 impl<S: Subscriber> Layer<S> for ErrorLogLayer {
     fn on_event(&self, event: &Event<'_>, _ctx: LayerContext<'_, S>) {
-        if *event.metadata().level() != Level::ERROR { return; }
+        if *event.metadata().level() != Level::ERROR {
+            return;
+        }
         let mut visitor = EventVisitor::default();
         event.record(&mut visitor);
         let mut fields = visitor.fields;
@@ -424,4 +465,6 @@ impl<S: Subscriber> Layer<S> for ErrorLogLayer {
 
 #[derive(Clone, Copy, Default)]
 pub struct RedactingStderr;
-pub struct RedactingWriter { buffer: Vec<u8> }
+pub struct RedactingWriter {
+    buffer: Vec<u8>,
+}