From 10840791ec3dc4224112795771633b48202da470 Mon Sep 17 00:00:00 2001 From: Martin Andre Date: Fri, 3 May 2024 13:35:22 +0200 Subject: [PATCH] fix: improve logging and allow to configure (env) Signed-off-by: Martin Andre --- frontend/package.json | 2 +- frontend/src-tauri/src/logger.rs | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index d273f53..e06788d 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -5,7 +5,7 @@ "scripts": { "dev": "cross-env RUST_BACKTRACE=1 concurrently -k \"tauri dev\" \"pnpm devtools\"", "tauri": "tauri", - "deb:build": "tauri build -b appimage", + "deb:build": "tauri build -d -b appimage", "build": "tauri build", "vite:dev": "vite dev", "vite:build": "vite build", diff --git a/frontend/src-tauri/src/logger.rs b/frontend/src-tauri/src/logger.rs index cd16e34..3ca0829 100644 --- a/frontend/src-tauri/src/logger.rs +++ b/frontend/src-tauri/src/logger.rs @@ -1,5 +1,6 @@ use std::fs::File; use std::path::{Path, PathBuf}; +use std::str::FromStr; use std::time::SystemTime; use fern::colors::{Color, ColoredLevelConfig}; @@ -7,11 +8,18 @@ use tauri::AppHandle; use time::OffsetDateTime; pub fn set_up_logging(app_handle: &AppHandle) -> Result<(), anyhow::Error> { - // Define default log level - let default_level = if cfg!(debug_assertions) { - log::LevelFilter::Trace - } else { - log::LevelFilter::Info + // Use log from ENV if defined, otherwise use Info/Trace depending on the build + let default_level = match std::env::var("RQS_LOG") { + Ok(r) => log::Level::from_str(&r) + .unwrap_or(log::Level::Debug) + .to_level_filter(), + Err(_) => { + if cfg!(debug_assertions) { + log::LevelFilter::Trace + } else { + log::LevelFilter::Info + } + } }; let colors = ColoredLevelConfig::new()