diff --git a/Cargo.lock b/Cargo.lock index 22e882a..3a7dfde 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3587,9 +3587,9 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" [[package]] name = "saa" -version = "5.3.3" +version = "5.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dfac11c0cd0606aaf7eb9ef66f82c119438a96dc487715abb8b57fdf08ad4fe" +checksum = "da0ba8adb63e0deebd0744d8fc5bea394c08029159deaf680513fec1a3949144" [[package]] name = "same-file" @@ -3602,9 +3602,9 @@ dependencies = [ [[package]] name = "scc" -version = "3.4.2" +version = "3.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd714a8af37b350df813d52ae4b2ea19211e40dac10dce189d80fb95e44cc618" +checksum = "e4bd9d1727de391b6982925d830baad51692fa2aa6e337733c03d95121ca2793" dependencies = [ "saa", "sdd", @@ -3651,9 +3651,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sdd" -version = "4.3.2" +version = "4.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19556830bd73d11d6961adaf20b1725fbb5b74c8cc32888a4dcd7049c56b6c35" +checksum = "c25da4ae64b24edfcb0b0d30b96b2b0dbc64ec63aefeb6ec35bfc5ef167e5c9e" [[package]] name = "sec1" diff --git a/crates/rproxy/Cargo.toml b/crates/rproxy/Cargo.toml index fe5fa91..6f59f81 100644 --- a/crates/rproxy/Cargo.toml +++ b/crates/rproxy/Cargo.toml @@ -52,7 +52,7 @@ rlimit = "0.10.2" rustc-hash = "2.1.1" rustls = "0.23.32" rustls-pemfile = "2.2.0" -scc = "3.0.2" +scc = "3.5.6" serde = { version = "1.0.219", features = ["derive"] } serde_json = "1.0.143" socket2 = "0.6.0" diff --git a/crates/rproxy/src/config.rs b/crates/rproxy/src/config.rs index 3b759b5..72535e6 100644 --- a/crates/rproxy/src/config.rs +++ b/crates/rproxy/src/config.rs @@ -6,7 +6,7 @@ use thiserror::Error; use x509_parser::asn1_rs::ToStatic; use crate::server::{ - config::{ConfigLogging, ConfigLoggingError, ConfigMetrics, ConfigMetricsError}, + config::{ConfigLogging, ConfigMetrics, ConfigMetricsError}, proxy::config::{ ConfigAuthrpc, ConfigAuthrpcError, @@ -161,11 +161,6 @@ impl Config { errs.append(&mut _errs.into_iter().map(|err| err.into()).collect()); } - // logging - if let Some(_errs) = self.logging.validate() { - errs.append(&mut _errs.into_iter().map(|err| err.into()).collect()); - } - // metrics if let Some(_errs) = self.metrics.validate() { errs.append(&mut _errs.into_iter().map(|err| err.into()).collect()); @@ -214,9 +209,6 @@ pub(crate) enum ConfigError { #[error("invalid flashblocks proxy configuration: {0}")] ConfigFlashblocksInvalid(ConfigFlashblocksError), - #[error("invalid logging configuration: {0}")] - ConfigLoggingInvalid(ConfigLoggingError), - #[error("invalid metrics configuration: {0}")] ConfigMetricsInvalid(ConfigMetricsError), @@ -248,12 +240,6 @@ impl From for ConfigError { } } -impl From for ConfigError { - fn from(err: ConfigLoggingError) -> Self { - Self::ConfigLoggingInvalid(err) - } -} - impl From for ConfigError { fn from(err: ConfigMetricsError) -> Self { Self::ConfigMetricsInvalid(err) diff --git a/crates/rproxy/src/server.rs b/crates/rproxy/src/server.rs index 1118bf7..765c53b 100644 --- a/crates/rproxy/src/server.rs +++ b/crates/rproxy/src/server.rs @@ -28,8 +28,6 @@ use crate::{ utils::tls_certificate_validity_timestamps, }; -const MAX_OPEN_FILES: u64 = 10240; - // Proxy --------------------------------------------------------------- pub struct Server {} diff --git a/crates/rproxy/src/server/config/logging.rs b/crates/rproxy/src/server/config/logging.rs index 9203173..72519e4 100644 --- a/crates/rproxy/src/server/config/logging.rs +++ b/crates/rproxy/src/server/config/logging.rs @@ -1,10 +1,8 @@ use clap::Args; -use thiserror::Error; use tracing_subscriber::{EnvFilter, fmt, prelude::*}; #[derive(Args, Clone, Debug)] pub(crate) struct ConfigLogging { - /// logging format #[arg( default_value = "json", env = "RPROXY_LOG_FORMAT", @@ -15,46 +13,21 @@ pub(crate) struct ConfigLogging { )] #[clap(value_enum)] pub(crate) format: ConfigLoggingFormat, - - /// logging level - #[arg( - help_heading = "log", - default_value = "info", - env = "RPROXY_LOG_LEVEL", - long("log-level"), - name("log_level"), - value_name = "level" - )] - pub(crate) level: String, } impl ConfigLogging { - pub(crate) fn validate(self) -> Option> { - let mut errs: Vec = vec![]; - - // level - let _ = EnvFilter::builder().parse(self.level).map_err(|err| { - errs.push(ConfigLoggingError::LevelInvalid { err: err.to_string() }); - }); - - match errs.len() { - 0 => None, - _ => Some(errs), - } - } - pub(crate) fn setup_logging(&self) { match self.format { ConfigLoggingFormat::Json => { tracing_subscriber::registry() - .with(EnvFilter::from(self.level.clone())) + .with(EnvFilter::from_default_env()) .with(fmt::layer().json().flatten_event(true)) .init(); } ConfigLoggingFormat::Text => { tracing_subscriber::registry() - .with(EnvFilter::from(self.level.clone())) + .with(EnvFilter::from_default_env()) .with(fmt::layer()) .init(); } @@ -69,11 +42,3 @@ pub(crate) enum ConfigLoggingFormat { Json, Text, } - -// ConfigLogError ------------------------------------------------------ - -#[derive(Debug, Clone, Error)] -pub(crate) enum ConfigLoggingError { - #[error("invalid log level filter: {err}")] - LevelInvalid { err: String }, -} diff --git a/crates/rproxy/src/server/config/mod.rs b/crates/rproxy/src/server/config/mod.rs index 4bdaa7d..c49a871 100644 --- a/crates/rproxy/src/server/config/mod.rs +++ b/crates/rproxy/src/server/config/mod.rs @@ -1,5 +1,5 @@ pub(crate) mod logging; -pub(crate) use logging::{ConfigLogging, ConfigLoggingError}; +pub(crate) use logging::ConfigLogging; pub(crate) mod metrics; pub(crate) use metrics::{ConfigMetrics, ConfigMetricsError};