hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-28 10:15:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rust: config: replace verbose with verbosity

Browse Source
This commit is contained in:
Arthur Baars
2025-02-11 18:32:32 +01:00
parent 3218faee6c
commit 5621eecc86
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
shared/tree-sitter-extractor/src/extractor/mod.rs
View File

@@ -22,15 +22,17 @@ pub mod simple;
/// `RUST_LOG` and `CODEQL_VERBOSITY` (prioritized in that order),
/// falling back to `warn` if neither is set.
pub fn set_tracing_level(language: &str) {
let verbosity = env::var("CODEQL_VERBOSITY").ok();
tracing_subscriber::registry()
.with(default_subscriber_with_level(language))
.with(default_subscriber_with_level(language, &verbosity))
.init();
}
/// Create a `Subscriber` configured with the tracing level based on the environment variables
/// `RUST_LOG` and `CODEQL_VERBOSITY` (prioritized in that order), falling back to `warn` if neither is set.
/// `RUST_LOG` and `verbosity` (prioritized in that order), falling back to `warn` if neither is set.
pub fn default_subscriber_with_level(
language: &str,
verbosity: &Option<String>,
) -> Filtered<
tracing_subscriber::fmt::Layer<
tracing_subscriber::Registry,
@@ -47,7 +49,8 @@ pub fn default_subscriber_with_level(
.with_filter(
tracing_subscriber::EnvFilter::try_from_default_env().unwrap_or_else(
|_| -> tracing_subscriber::EnvFilter {
let verbosity = env::var("CODEQL_VERBOSITY")
let verbosity = verbosity
.as_ref()
.map(|v| match v.to_lowercase().as_str() {
"off" | "errors" => "error",
"warnings" => "warn",
@@ -56,7 +59,7 @@ pub fn default_subscriber_with_level(
"trace" | "progress++" | "progress+++" => "trace",
_ => "warn",
})
.unwrap_or_else(|_| "warn");
.unwrap_or_else(|| "warn");
tracing_subscriber::EnvFilter::new(format!(
"{language}_extractor={verbosity},codeql_extractor={verbosity}"
))