Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/apps/desktop/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,6 @@ pub async fn _run() {
let mut startup_timings = TimingCollector::default();
let in_debug = cfg!(debug_assertions) || std::env::var("DEBUG").unwrap_or_default() == "1";
let log_config = logging::LogConfig::new(in_debug);
let log_targets = logging::build_log_targets(&log_config);
let session_log_dir = log_config.session_log_dir.clone();
crash_diagnostics::initialize_run_state(session_log_dir.clone(), &startup_trace_id);
setup_panic_hook();
Expand All @@ -383,6 +382,16 @@ pub async fn _run() {
startup_timings.record_elapsed("initialize_global_config", step_started);
startup_trace.record_elapsed_step("native_pre_tauri", "initialize_global_config", step_started);

let step_started = Instant::now();
let startup_log_level = resolve_runtime_log_level(log_config.level).await;
log::set_max_level(startup_log_level);
let log_targets = logging::build_log_targets(&log_config);
startup_trace.record_elapsed_step(
"native_pre_tauri",
"resolve_runtime_log_level",
step_started,
);

// Initialize global I18nService so bot/remote-connect language is always in sync.
{
use bitfun_core::service::config::get_global_config_service;
Expand Down Expand Up @@ -510,7 +519,7 @@ pub async fn _run() {
let mut builder = tauri::Builder::default();

let app = builder
.plugin(logging::build_log_plugin(log_targets))
.plugin(logging::build_log_plugin(log_targets, startup_log_level))
.plugin(tauri_plugin_opener::init())
.plugin(tauri_plugin_fs::init())
.manage(app_state)
Expand Down
4 changes: 2 additions & 2 deletions src/apps/desktop/src/logging.rs
Original file line number Diff line number Diff line change
Expand Up @@ -289,9 +289,9 @@ pub fn build_log_targets(config: &LogConfig) -> Vec<Target> {
targets
}

pub fn build_log_plugin<R: Runtime>(log_targets: Vec<Target>) -> TauriPlugin<R> {
pub fn build_log_plugin<R: Runtime>(log_targets: Vec<Target>, initial_level: log::LevelFilter) -> TauriPlugin<R> {
tauri_plugin_log::Builder::new()
.level(log::LevelFilter::Trace)
.level(initial_level)
.level_for("ignore", log::LevelFilter::Off)
.level_for("ignore::walk", log::LevelFilter::Off)
.level_for("globset", log::LevelFilter::Off)
Expand Down
Loading