From 743a98caaea51291c126e37dbff76515f142a0be Mon Sep 17 00:00:00 2001 From: Andreas Coroiu Date: Thu, 4 Dec 2025 16:06:13 +0100 Subject: [PATCH] Revert "Desktop Native compile debug builds with debug log level (#17357)" (#17815) This reverts commit a2abbd09bf40c06268ef38803b4e7148684607b3. (cherry picked from commit 5386b58f2329eaed2acb9178560eeca9a265bb16) --- apps/desktop/desktop_native/napi/package.json | 2 +- apps/desktop/desktop_native/napi/scripts/build.js | 14 -------------- apps/desktop/desktop_native/napi/src/lib.rs | 14 +++----------- 3 files changed, 4 insertions(+), 26 deletions(-) delete mode 100644 apps/desktop/desktop_native/napi/scripts/build.js diff --git a/apps/desktop/desktop_native/napi/package.json b/apps/desktop/desktop_native/napi/package.json index ca17377c9f2..d557ccfd259 100644 --- a/apps/desktop/desktop_native/napi/package.json +++ b/apps/desktop/desktop_native/napi/package.json @@ -3,7 +3,7 @@ "version": "0.1.0", "description": "", "scripts": { - "build": "node scripts/build.js", + "build": "napi build --platform --js false", "test": "cargo test" }, "author": "", diff --git a/apps/desktop/desktop_native/napi/scripts/build.js b/apps/desktop/desktop_native/napi/scripts/build.js deleted file mode 100644 index 7b3dccf81e4..00000000000 --- a/apps/desktop/desktop_native/napi/scripts/build.js +++ /dev/null @@ -1,14 +0,0 @@ -/* eslint-disable @typescript-eslint/no-var-requires */ -const { execSync } = require('child_process'); - -const args = process.argv.slice(2); -const isRelease = args.includes('--release'); - -if (isRelease) { - console.log('Building release mode.'); -} else { - console.log('Building debug mode.'); - process.env.RUST_LOG = 'debug'; -} - -execSync(`napi build --platform --js false ${isRelease ? '--release' : ''}`, { stdio: 'inherit', env: process.env }); diff --git a/apps/desktop/desktop_native/napi/src/lib.rs b/apps/desktop/desktop_native/napi/src/lib.rs index c34e7574f68..b5dcb277a75 100644 --- a/apps/desktop/desktop_native/napi/src/lib.rs +++ b/apps/desktop/desktop_native/napi/src/lib.rs @@ -961,7 +961,7 @@ pub mod logging { }; use tracing::Level; use tracing_subscriber::{ - filter::EnvFilter, + filter::{EnvFilter, LevelFilter}, fmt::format::{DefaultVisitor, Writer}, layer::SubscriberExt, util::SubscriberInitExt, @@ -1049,17 +1049,9 @@ pub mod logging { pub fn init_napi_log(js_log_fn: ThreadsafeFunction<(LogLevel, String), CalleeHandled>) { let _ = JS_LOGGER.0.set(js_log_fn); - // the log level hierarchy is determined by: - // - if RUST_LOG is detected at runtime - // - if RUST_LOG is provided at compile time - // - default to INFO let filter = EnvFilter::builder() - .with_default_directive( - option_env!("RUST_LOG") - .unwrap_or("info") - .parse() - .expect("should provide valid log level at compile time."), - ) + // set the default log level to INFO. + .with_default_directive(LevelFilter::INFO.into()) // parse directives from the RUST_LOG environment variable, // overriding the default directive for matching targets. .from_env_lossy();