read RUST_LOG

Author: eval-exec

android-app/app/src/main/java/com/nervosnetwork/ckblightclient/LightClientNative.kt

@@ -56,6 +56,19 @@ object LightClientNative {
      */
     external fun nativeGetStatus(): Int
 
+    /**
+     * Set log filter using RUST_LOG format
+     *
+     * @param filter RUST_LOG-style filter string
+     *   Examples:
+     *   - "info" - all modules at info level
+     *   - "debug" - all modules at debug level
+     *   - "info,ckb_network=debug" - most at info, ckb_network at debug
+     *   - "info,ckb_network=debug,ckb_sync=trace" - per-module levels
+     * @return true if successful, false otherwise
+     */
+    external fun nativeSetLogFilter(filter: String): Boolean
+
     // ========================================
     // Query APIs (17 functions)
     // ========================================

android-app/app/src/main/java/com/nervosnetwork/ckblightclient/LightClientService.kt

@@ -183,6 +183,12 @@ class LightClientService : Service() {
 
             appendLog("Native initialization succeeded")
 
+            // Apply saved RUST_LOG filter
+            val prefs = getSharedPreferences("CKBLightClientPrefs", Context.MODE_PRIVATE)
+            val savedFilter = prefs.getString("rust_log_filter", "info") ?: "info"
+            LightClientNative.nativeSetLogFilter(savedFilter)
+            appendLog("Applied log filter: $savedFilter")
+
             // Start the light client
             val startSuccess = LightClientNative.nativeStart()
 

light-client-lib/Cargo.toml

@@ -63,6 +63,7 @@ ckb-stop-handler = "1"
 [target.'cfg(target_os = "android")'.dependencies]
 jni = "0.21"
 android_logger = "0.13"
+env_logger = "0.11"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 web-time = "1.1.0"

light-client-lib/src/jni_bridge/callbacks.rs

@@ -6,9 +6,10 @@ use super::types::{JAVA_VM, LOG_CALLBACK, STATUS_CALLBACK};
 use jni::JNIEnv;
 use jni::objects::{JObject, JString, JValue};
 use jni::sys::jobjectArray;
-use log::{Level, Log, Metadata, Record};
-use std::sync::{Arc, Mutex};
+use log::{Level, LevelFilter, Log, Metadata, Record};
+use std::sync::{Arc, Mutex, RwLock};
 use std::time::{Duration, Instant};
+use env_logger::filter::{Builder as FilterBuilder, Filter};
 
 /// Log buffer for batching
 struct LogBuffer {
@@ -31,13 +32,40 @@ impl LogBuffer {
 
 static LOG_BUFFER: Mutex<Option<LogBuffer>> = Mutex::new(None);
 
-/// JNI Logger implementation with batching
+/// Global log filter using env_logger's Filter for RUST_LOG-style filtering
+static LOG_FILTER: RwLock<Option<Filter>> = RwLock::new(None);
+
+/// Update log filter from RUST_LOG-style string using env_logger's parser
+/// Examples: "info", "debug", "info,ckb_network=debug", "info,ckb_sync=trace,ckb_network=debug"
+pub fn set_log_filter(rust_log: &str) {
+    // Set RUST_LOG environment variable so env_logger can parse it
+    std::env::set_var("RUST_LOG", rust_log);
+
+    // Let env_logger parse the RUST_LOG environment variable
+    let filter = FilterBuilder::from_default_env().build();
+
+    // Update global filter
+    if let Ok(mut filter_guard) = LOG_FILTER.write() {
+        *filter_guard = Some(filter);
+        log::set_max_level(LevelFilter::Trace); // Allow all, filtering in enabled()
+    }
+}
+
+/// JNI Logger implementation with batching and RUST_LOG-style filtering
 pub struct JniLogger;
 
 impl Log for JniLogger {
     fn enabled(&self, metadata: &Metadata) -> bool {
-        // Enable all levels, filtering is done by env_logger
-        metadata.level() <= Level::Trace
+        if let Ok(filter_guard) = LOG_FILTER.read() {
+            if let Some(filter) = filter_guard.as_ref() {
+                filter.matches(metadata)
+            } else {
+                // Default to info level if no filter set
+                metadata.level() <= LevelFilter::Info
+            }
+        } else {
+            metadata.level() <= LevelFilter::Info
+        }
     }
 
     fn log(&self, record: &Record) {

light-client-lib/src/jni_bridge/lifecycle.rs

@@ -101,6 +101,8 @@ pub extern "C" fn Java_com_nervosnetwork_ckblightclient_LightClientNative_native
         eprintln!("Failed to set logger: {}", e);
         return JNI_FALSE;
     }
+    // Default to Info level - can be changed via nativeSetLogLevel()
+    // or by setting RUST_LOG-style filter string
     log::set_max_level(log::LevelFilter::Info);
 
     info!("Starting CKB Light Client JNI initialization...");
@@ -392,3 +394,35 @@ pub extern "C" fn Java_com_nervosnetwork_ckblightclient_LightClientNative_native
 ) -> jint {
     get_state() as jint
 }
+
+/// JNI: Set log filter using RUST_LOG format
+///
+/// Parameters:
+/// - filter_str: RUST_LOG-style filter string
+///   Examples:
+///   - "info" - all modules at info level
+///   - "debug" - all modules at debug level
+///   - "info,ckb_network=debug" - most at info, ckb_network at debug
+///   - "info,ckb_network=debug,ckb_sync=trace" - per-module levels
+///
+/// Returns true if successful, false otherwise
+#[no_mangle]
+pub extern "C" fn Java_com_nervosnetwork_ckblightclient_LightClientNative_nativeSetLogFilter(
+    mut env: JNIEnv,
+    _class: JClass,
+    filter_jstr: JString,
+) -> jboolean {
+    // Get filter string
+    let filter_str: String = match env.get_string(&filter_jstr) {
+        Ok(s) => s.into(),
+        Err(e) => {
+            error!("Failed to get filter string: {}", e);
+            return JNI_FALSE;
+        }
+    };
+
+    info!("Setting log filter to: {}", filter_str);
+    super::callbacks::set_log_filter(&filter_str);
+
+    JNI_TRUE
+}