feat: Support comet native log level conf

Author: wForget

common/src/main/java/org/apache/comet/NativeBase.java

@@ -35,6 +35,7 @@
 
 import static org.apache.comet.Constants.LOG_CONF_NAME;
 import static org.apache.comet.Constants.LOG_CONF_PATH;
+import static org.apache.comet.Constants.LOG_LEVEL;
 
 /** Base class for JNI bindings. MUST be inherited by all classes that introduce JNI APIs. */
 public abstract class NativeBase {
@@ -153,18 +154,25 @@ private static void bundleLoadLibrary() {
 
   private static void initWithLogConf() {
     String logConfPath = System.getProperty(LOG_CONF_PATH(), Utils.getConfPath(LOG_CONF_NAME()));
+    String logLevel = System.getProperty(LOG_LEVEL());
 
     // If both the system property and the environmental variable failed to find a log
     // configuration, then fall back to using the deployed default
     if (logConfPath == null) {
       LOG.info(
           "Couldn't locate log file from either COMET_CONF_DIR or comet.log.file.path. "
-              + "Using default log configuration which emits to stdout");
+              + "Using default log configuration with {} log level which emits to stdout",
+          logLevel == null ? "INFO" : logLevel);
       logConfPath = "";
     } else {
+      // Ignore log level if a log configuration file is specified
+      if (logLevel != null) {
+        LOG.warn("Ignoring log level {} because a log configuration file is specified", logLevel);
+      }
+
       LOG.info("Using {} for native library logging", logConfPath);
     }
-    init(logConfPath);
+    init(logConfPath, logLevel);
   }
 
   private static void cleanupOldTempLibs() {
@@ -283,5 +291,5 @@ private static String resourceName() {
    *
    * @param logConfPath location to the native log configuration file
    */
-  static native void init(String logConfPath);
+  static native void init(String logConfPath, String logLevel);
 }

common/src/main/scala/org/apache/comet/Constants.scala

@@ -22,4 +22,5 @@ package org.apache.comet
 object Constants {
   val LOG_CONF_PATH = "comet.log.file.path"
   val LOG_CONF_NAME = "log4rs.yaml"
+  val LOG_LEVEL = "comet.log.level"
 }

native/core/src/lib.rs

@@ -30,7 +30,7 @@ use jni::{
     objects::{JClass, JString},
     JNIEnv, JavaVM,
 };
-use log::{info, LevelFilter};
+use log::info;
 use log4rs::{
     append::console::{ConsoleAppender, Target},
     config::{load_config_file, Appender, Deserializers, Root},
@@ -70,6 +70,7 @@ pub extern "system" fn Java_org_apache_comet_NativeBase_init(
     e: JNIEnv,
     _: JClass,
     log_conf_path: JString,
+    log_level: JString,
 ) {
     // Initialize the error handling to capture panic backtraces
     errors::init();
@@ -80,7 +81,11 @@ pub extern "system" fn Java_org_apache_comet_NativeBase_init(
         // empty path means there is no custom log4rs config file provided, so fallback to use
         // the default configuration
         let log_config = if path.is_empty() {
-            default_logger_config()
+            let log_level: String = match env.get_string(&log_level) {
+                Ok(level) => level.into(),
+                Err(_) => "info".parse().unwrap(),
+            };
+            default_logger_config(&log_level)
         } else {
             load_config_file(path, Deserializers::default())
                 .map_err(|err| CometError::Config(err.to_string()))
@@ -100,14 +105,18 @@ pub extern "system" fn Java_org_apache_comet_NativeBase_init(
 
 const LOG_PATTERN: &str = "{d(%y/%m/%d %H:%M:%S)} {l} {f}: {m}{n}";
 
-// Creates a default log4rs config, which logs to console with `INFO` level.
-fn default_logger_config() -> CometResult<Config> {
+// Creates a default log4rs config, which logs to console with log level.
+fn default_logger_config(log_level: &str) -> CometResult<Config> {
     let console_append = ConsoleAppender::builder()
         .target(Target::Stderr)
         .encoder(Box::new(PatternEncoder::new(LOG_PATTERN)))
         .build();
     let appender = Appender::builder().build("console", Box::new(console_append));
-    let root = Root::builder().appender("console").build(LevelFilter::Info);
+    let root = Root::builder().appender("console").build(
+        log_level
+            .parse()
+            .map_err(|err| CometError::Config(format!("{err}")))?,
+    );
     Config::builder()
         .appender(appender)
         .build(root)