Skip to content

Commit

Permalink
fix: improve logging and allow to configure (env)
Browse files Browse the repository at this point in the history
Signed-off-by: Martin Andre <m@rtin.fyi>
  • Loading branch information
Martichou committed May 3, 2024
1 parent 151cbfd commit 1084079
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 6 deletions.
2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
18 changes: 13 additions & 5 deletions frontend/src-tauri/src/logger.rs
Original file line number Diff line number Diff line change
@@ -1,17 +1,25 @@
use std::fs::File;
use std::path::{Path, PathBuf};
use std::str::FromStr;
use std::time::SystemTime;

use fern::colors::{Color, ColoredLevelConfig};
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()
Expand Down

0 comments on commit 1084079

Please # to comment.