From 3e7a2e78833157d838547de812149aa492824d78 Mon Sep 17 00:00:00 2001 From: charles-gauthereau Date: Tue, 10 Nov 2026 12:53:58 +0100 Subject: [PATCH 1/2] fix(logging): apply log level to file output and make file logging opt-in --- src/settings.rs | 7 ++++++- src/utils/logging.rs | 41 +++++++++++++++++++++++++---------------- 2 files changed, 31 insertions(+), 17 deletions(-) diff --git a/src/settings.rs b/src/settings.rs index 552c05bf..1d69a682 100644 --- a/src/settings.rs +++ b/src/settings.rs @@ -16,6 +16,7 @@ pub struct Settings { pub polling: usize, pub timezone: String, pub log: String, + pub log_to_file: bool, pub chunk_size: usize, // bytes pub retry_attempts: u32, pub retry_backoff_ms: u64, @@ -89,7 +90,11 @@ impl Settings { pg_bin_dir: env::var("PG_BIN_DIR").unwrap_or_default(), polling: polling_seconds, timezone: tz, - log: env::var("LOG").unwrap_or_else(|_| "info".into()), + log: env::var("LOG") + .or_else(|_| env::var("LOG_LEVEL")) + .unwrap_or_else(|_| "info".into()), + log_to_file: env::var("LOG_TO_FILE") + .is_ok_and(|value| value.trim().eq_ignore_ascii_case("true")), chunk_size, retry_attempts, retry_backoff_ms, diff --git a/src/utils/logging.rs b/src/utils/logging.rs index 855fb9d3..2f399000 100644 --- a/src/utils/logging.rs +++ b/src/utils/logging.rs @@ -7,26 +7,32 @@ use tracing_subscriber::fmt::time::LocalTime; use tracing_subscriber::{EnvFilter, Registry, fmt, prelude::*}; const LOGS_DIRECTORY: &str = "/var/log/app"; +const LOG_FILES_KEPT: usize = 7; static FILE_APPENDER: LazyLock<(NonBlocking, WorkerGuard)> = LazyLock::new(|| { - let file_appender = RollingFileAppender::new(Rotation::DAILY, LOGS_DIRECTORY, "app.log"); + std::fs::create_dir_all(LOGS_DIRECTORY).ok(); + let file_appender = RollingFileAppender::builder() + .rotation(Rotation::DAILY) + .filename_prefix("app.log") + .max_log_files(LOG_FILES_KEPT) + .build(LOGS_DIRECTORY) + .expect("Failed to initialize log file appender"); tracing_appender::non_blocking(file_appender) }); pub fn init_logger() { - std::fs::create_dir_all(LOGS_DIRECTORY).ok(); - - let (writer, _guard) = &*FILE_APPENDER; - let timer = LocalTime::new(format_description!( "[year]-[month]-[day]T[hour]:[minute]:[second]" )); - let file_layer = fmt::layer() - .with_writer(writer.clone()) - .with_timer(timer.clone()) - .with_ansi(false) - .with_target(false); + let file_layer = CONFIG.log_to_file.then(|| { + let (writer, _guard) = &*FILE_APPENDER; + fmt::layer() + .with_writer(writer.clone()) + .with_timer(timer.clone()) + .with_ansi(false) + .with_target(false) + }); let env_filter = EnvFilter::new(format!( "{},aws_sdk_s3=warn,aws_smithy_http=warn,aws_smithy_runtime=warn,aws_smithy_client=warn,aws_smithy_types=warn,reqwest=warn,hyper=warn,tokio=warn,h2=warn", @@ -35,18 +41,21 @@ pub fn init_logger() { let term_layer = fmt::layer() .with_writer(std::io::stdout) - .with_timer(timer.clone()) + .with_timer(timer) .with_ansi(true) - .with_target(false) - .with_filter(env_filter); + .with_target(false); - let subscriber = Registry::default().with(file_layer).with(term_layer); + let subscriber = Registry::default() + .with(env_filter) + .with(file_layer) + .with(term_layer); tracing::subscriber::set_global_default(subscriber).expect("Failed to set global subscriber"); tracing::info!( - "Logger initialized | TZ={} | POLLING={}s", + "Logger initialized | TZ={} | POLLING={}s | LOG_TO_FILE={}", CONFIG.timezone, - CONFIG.polling + CONFIG.polling, + CONFIG.log_to_file ); } From 4e096ecbc757eabd30b586034022d19e8e938dad Mon Sep 17 00:00:00 2001 From: charles-gauthereau Date: Tue, 10 Nov 2026 13:17:54 +0100 Subject: [PATCH 2/2] fix: refactoring --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index f31463b1..57d523c4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,7 +26,7 @@ services: LOG: debug TZ: "Europe/Paris" # TMPDIR: /scratch - EDGE_KEY: "eyJzZXJ2ZXJVcmwiOiJodHRwOi8vbG9jYWxob3N0Ojg4ODciLCJhZ2VudElkIjoiYTgwZTZkM2UtMjcyYi00NGVmLWIzNjUtMDZlZTg1OTk0MzFhIiwibWFzdGVyS2V5QjY0IjoiQlhWM1hvbEM2NTZTVjdkTmdjV1BHUWxrKytycExJNmxHRGk3Q1BCNWllbz0ifQ==" + EDGE_KEY: "eyJzZXJ2ZXJVcmwiOiJodHRwOi8vbG9jYWxob3N0Ojg4ODciLCJhZ2VudElkIjoiOGYzOTAyYjgtZmU0Yy00NmY2LWE0ODktNzE5MTNhZTgxMjg3IiwibWFzdGVyS2V5QjY0IjoiMUh0djdtWCtYVkJxL0IzUEV2WDlZZjlQeUdVZW5oRHlXemo5THRqNW90WT0ifQ==" #CHUNK_SIZE_MB: "1" #POLLING: 1 #RETRY_ATTEMPTS: 3