tyiu/notedeck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge fix file logging #718

Browse Source 
kernelkind (1):
      fix file logging
This commit is contained in:
William Casarin
2025-02-06 14:00:49 -08:00
parent 0aa70239fe d916021179
commit 36dc28451a
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crates/notedeck_chrome/src/notedeck.rs
View File

@@ -4,13 +4,14 @@ use notedeck_chrome::setup::{generate_native_options, setup_chrome};
use notedeck::{DataPath, DataPathType, Notedeck}; use notedeck::{DataPath, DataPathType, Notedeck};
use notedeck_columns::Damus; use notedeck_columns::Damus;
use tracing_appender::non_blocking::WorkerGuard;
use tracing_subscriber::EnvFilter; use tracing_subscriber::EnvFilter;
// Entry point for wasm // Entry point for wasm
//#[cfg(target_arch = "wasm32")] //#[cfg(target_arch = "wasm32")]
//use wasm_bindgen::prelude::*; //use wasm_bindgen::prelude::*;
fn setup_logging(path: &DataPath) { fn setup_logging(path: &DataPath) -> Option<WorkerGuard> {
#[allow(unused_variables)] // need guard to live for lifetime of program #[allow(unused_variables)] // need guard to live for lifetime of program
let (maybe_non_blocking, maybe_guard) = { let (maybe_non_blocking, maybe_guard) = {
let log_path = path.path(DataPathType::Log); let log_path = path.path(DataPathType::Log);
@@ -57,6 +58,8 @@ fn setup_logging(path: &DataPath) {
.with_env_filter(EnvFilter::from_default_env()) .with_env_filter(EnvFilter::from_default_env())
.init(); .init();
} }
maybe_guard
} }
// Desktop // Desktop
@@ -66,7 +69,8 @@ async fn main() {
let base_path = DataPath::default_base_or_cwd(); let base_path = DataPath::default_base_or_cwd();
let path = DataPath::new(base_path.clone()); let path = DataPath::new(base_path.clone());
setup_logging(&path); // This guard must be scoped for the duration of the entire program so all logs will be written
let _guard = setup_logging(&path);
let _res = eframe::run_native( let _res = eframe::run_native(
"Damus Notedeck", "Damus Notedeck",