From c02e92dd72b38cee725ed4f9c9c976a78911071d Mon Sep 17 00:00:00 2001 From: rm-dr <96270320+rm-dr@users.noreply.github.com> Date: Tue, 10 Mar 2026 09:13:37 -0700 Subject: [PATCH] Logging + config tweaks --- crates/pile-config/src/lib.rs | 2 +- crates/pile-config/src/misc.rs | 24 ------------------------ crates/pile/src/config/logging.rs | 13 +++++++++++++ 3 files changed, 14 insertions(+), 25 deletions(-) diff --git a/crates/pile-config/src/lib.rs b/crates/pile-config/src/lib.rs index 42991ac..944a2e6 100644 --- a/crates/pile-config/src/lib.rs +++ b/crates/pile-config/src/lib.rs @@ -99,7 +99,7 @@ pub struct FieldSpec { pub r#type: FieldType, /// How to find this field in a data entry - pub path: OneOrMany, + pub path: Vec, /// How to post-process this field #[serde(default)] diff --git a/crates/pile-config/src/misc.rs b/crates/pile-config/src/misc.rs index b0adb99..21b3a8b 100644 --- a/crates/pile-config/src/misc.rs +++ b/crates/pile-config/src/misc.rs @@ -1,33 +1,9 @@ -use core::slice; use std::fmt::{Debug, Display}; use std::ops::Deref; use serde::{Deserialize, Serialize}; use smartstring::{LazyCompact, SmartString}; -#[derive(Debug, Clone, Deserialize)] -#[serde(untagged)] -pub enum OneOrMany { - One(T), - Many(Vec), -} - -impl OneOrMany { - pub fn to_vec(self) -> Vec { - match self { - Self::One(x) => vec![x], - Self::Many(x) => x, - } - } - - pub fn as_slice(&self) -> &[T] { - match self { - Self::One(x) => slice::from_ref(x), - Self::Many(x) => &x[..], - } - } -} - // // MARK: Label // diff --git a/crates/pile/src/config/logging.rs b/crates/pile/src/config/logging.rs index ccbbd8f..306f91c 100644 --- a/crates/pile/src/config/logging.rs +++ b/crates/pile/src/config/logging.rs @@ -37,6 +37,8 @@ pub enum LoggingPreset { pub struct LoggingConfig { other: LogLevel, + extractor: LogLevel, + pile: LogLevel, pile_flac: LogLevel, pile_config: LogLevel, @@ -53,7 +55,13 @@ impl From for EnvFilter { // Fixed sources format!("html5ever={}", LogLevel::Error), format!("tantivy={}", LogLevel::Error), + format!("aws_smithy_runtime={}", LogLevel::Error), + format!("aws_smithy_http_client={}", LogLevel::Error), + format!("aws_sdk_s3={}", LogLevel::Error), + format!("aws_sigv4={}", LogLevel::Error), + format!("hyper_util={}", LogLevel::Error), // Configurable sources + format!("pdf={}", conf.extractor), format!("pile={}", conf.pile), format!("pile_flac={}", conf.pile_flac), format!("pile_config={}", conf.pile_config), @@ -78,6 +86,7 @@ impl LoggingPreset { match self { Self::Error => LoggingConfig { other: LogLevel::Error, + extractor: LogLevel::Error, pile: LogLevel::Error, pile_flac: LogLevel::Error, @@ -88,6 +97,7 @@ impl LoggingPreset { Self::Warn => LoggingConfig { other: LogLevel::Error, + extractor: LogLevel::Error, pile: LogLevel::Warn, pile_flac: LogLevel::Warn, @@ -98,6 +108,7 @@ impl LoggingPreset { Self::Info => LoggingConfig { other: LogLevel::Warn, + extractor: LogLevel::Error, pile: LogLevel::Info, pile_flac: LogLevel::Info, @@ -108,6 +119,7 @@ impl LoggingPreset { Self::Debug => LoggingConfig { other: LogLevel::Warn, + extractor: LogLevel::Error, pile: LogLevel::Debug, pile_flac: LogLevel::Debug, @@ -118,6 +130,7 @@ impl LoggingPreset { Self::Trace => LoggingConfig { other: LogLevel::Trace, + extractor: LogLevel::Error, pile: LogLevel::Trace, pile_flac: LogLevel::Trace,