Merge pull request #158 from intel/respect-config-loglevel

Update global log-level from config

Author: JonatanWaern

CHANGELOG.md

@@ -17,6 +17,9 @@
   (in some cases), resulting in performance improvements.
 - The DLS will now try to stop ongoing work when asked to shut down,
   which should make it exit faster.
+- Adjusted error message in DFA when unable to open DLS binary
+- The DLS will now update the internal log-level when after a configuration
+  update
 
 ## 0.9.13
 - Corrected the name of "explicit\_param\_decls" provisional. Note that it still

Cargo.toml

@@ -36,7 +36,7 @@ itertools = "0.14"
 jsonrpc = "0.18"
 lsp-types = { version = "0.97" }
 lazy_static = "1.4"
-log = "0.4"
+log = {version = "0.4", features = ["serde"]}
 logos = "0.15"
 rayon = "1"
 regex = "1.5.5"

src/actions/mod.rs

@@ -720,6 +720,11 @@ impl <O: Output> InitActionContext<O> {
                 self.report_errors(out);
             },
         }
+
+        // Re-update log level
+        if let Some(level) = self.config.lock().unwrap().server_debug_level {
+            crate::logging::set_global_log_level(level);
+        }
     }
 
     // Call before adding new analysis

src/config.rs

@@ -132,6 +132,7 @@ pub struct Config {
     pub lint_cfg_path: Option<PathBuf>,
     pub lint_direct_only: bool,
     pub no_default_features: bool,
+    pub server_debug_level: Option<log::LevelFilter>,
     // pub jobs: Option<u32>,
     pub compile_info_path: Option<PathBuf>,
     pub analysis_retain_duration: Option<f64>,
@@ -216,6 +217,7 @@ impl Default for Config {
             linting_enabled: true,
             lint_cfg_path: None,
             lint_direct_only: true,
+            server_debug_level: None,
             no_default_features: false,
             compile_info_path: None,
             analysis_retain_duration: None,

src/dfa/main.rs

@@ -16,10 +16,11 @@ use clap::{command, arg, Arg, ArgAction};
 
 use dls::dfa::ClientInterface;
 
+
 use log::debug;
 
 pub fn main() {
-    env_logger::init();
+    dls::logging::init();
     let code = main_inner();
     std::process::exit(match code {
         Ok(()) => 0,
@@ -143,7 +144,7 @@ fn main_inner() -> Result<(), i32> {
     let mut dlsclient = ClientInterface::start(&arg.binary, root, linting_enabled)
         .map_err(|e|{
             std::io::stdout().write_all(
-                format!("Failed to open client binary: {}\n",
+                format!("Failed to start client: {}\n",
                         e).as_bytes())
                 .ok();
             1})?;

src/lib.rs

@@ -44,6 +44,7 @@ pub mod utility;
 pub mod vfs;
 #[cfg(test)]
 pub mod test;
+pub mod logging;
 
 type Span = span::Span<span::ZeroIndexed>;
 

src/lint/mod.rs

@@ -559,7 +559,7 @@ pub mod tests {
         use crate::lint::rules::Rule;
         use crate::analysis::ZeroRange;
 
-        env_logger::init();
+        crate::logging::init();
 
         let source =
             "

src/logging.rs

@@ -0,0 +1,18 @@
+//  © 2024 Intel Corporation
+//  SPDX-License-Identifier: Apache-2.0 and MIT
+
+pub fn init() {
+    // Slightly dumb way to do this, build the logger once with defaults
+    // to get the max level for all modules from env, then build again
+    // to remove this restriction and place it on log:: instead
+    let dummy_logger = env_logger::Builder::from_default_env().build();
+    let max_level = dummy_logger.filter();
+    env_logger::Builder::from_default_env()
+        .filter_level(log::LevelFilter::Trace)
+        .init();
+    set_global_log_level(max_level);
+}
+
+pub fn set_global_log_level(level: log::LevelFilter) {
+    log::set_max_level(level);
+}

src/main.rs

@@ -13,7 +13,7 @@ use clap::{Parser, command, arg};
 /// The main entry point to the DLS.
 // Parses CLI arguments and then runs the server.
 pub fn main() {
-    env_logger::init();
+    dls::logging::init();
     let exit_code = main_inner();
     std::process::exit(exit_code);
 }