fix: remove redundant log level flag

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"

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<ConfigFlashblocksError> for ConfigError {
     }
 }
 
-impl From<ConfigLoggingError> for ConfigError {
-    fn from(err: ConfigLoggingError) -> Self {
-        Self::ConfigLoggingInvalid(err)
-    }
-}
-
 impl From<ConfigMetricsError> for ConfigError {
     fn from(err: ConfigMetricsError) -> Self {
         Self::ConfigMetricsInvalid(err)

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 {}

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<Vec<ConfigLoggingError>> {
-        let mut errs: Vec<ConfigLoggingError> = 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 },
-}

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};