hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-16 08:43:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16636 from hvitved/tree-sitter/verbosity-fix

Browse Source 
Tree-sitter: Verbosity fixes
This commit is contained in:
Tom Hvitved
2024-06-04 08:33:28 +02:00
committed by GitHub
parent 133983678c beeae69845
commit e6dc36b2c4
4 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruby/extractor/src/extractor.rs
View File

@@ -26,6 +26,7 @@ pub struct Options {
pub fn run(options: Options) -> std::io::Result<()> { pub fn run(options: Options) -> std::io::Result<()> {
extractor::set_tracing_level("ruby"); extractor::set_tracing_level("ruby");
tracing::info!("Extraction started");
let diagnostics = diagnostics::DiagnosticLoggers::new("ruby"); let diagnostics = diagnostics::DiagnosticLoggers::new("ruby");
let mut main_thread_logger = diagnostics.logger(); let mut main_thread_logger = diagnostics.logger();
let num_threads = match codeql_extractor::options::num_threads() { let num_threads = match codeql_extractor::options::num_threads() {
@@ -210,7 +211,9 @@ pub fn run(options: Options) -> std::io::Result<()> {
let path = PathBuf::from("extras"); let path = PathBuf::from("extras");
let mut trap_writer = trap::Writer::new(); let mut trap_writer = trap::Writer::new();
extractor::populate_empty_location(&mut trap_writer); extractor::populate_empty_location(&mut trap_writer);
write_trap(&trap_dir, path, &trap_writer, trap_compression) let res = write_trap(&trap_dir, path, &trap_writer, trap_compression);
tracing::info!("Extraction complete");
res
} }
lazy_static! { lazy_static! {

6
shared/tree-sitter-extractor/src/autobuilder.rs
View File

@@ -54,6 +54,12 @@ impl Autobuilder {
let mut cmd = Command::new(codeql); let mut cmd = Command::new(codeql);
cmd.arg("database").arg("index-files"); cmd.arg("database").arg("index-files");
let verbosity = env::var("CODEQL_VERBOSITY");
if let Ok(verbosity) = verbosity {
cmd.arg(format!("--verbosity={}", verbosity));
}
for ext in &self.include_extensions { for ext in &self.include_extensions {
cmd.arg(format!("--include-extension={}", ext)); cmd.arg(format!("--include-extension={}", ext));
} }

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

@@ -33,8 +33,7 @@ pub fn set_tracing_level(language: &str) {
}) })
.unwrap_or_else(|_| "warn"); .unwrap_or_else(|_| "warn");
tracing_subscriber::EnvFilter::new(format!( tracing_subscriber::EnvFilter::new(format!(
"{}_extractor={}", "{language}_extractor={verbosity},codeql_extractor={verbosity}"
language, verbosity
)) ))
}, },
), ),

5
shared/tree-sitter-extractor/src/extractor/simple.rs
View File

@@ -29,6 +29,7 @@ pub struct Extractor {
impl Extractor { impl Extractor {
pub fn run(&self) -> std::io::Result<()> { pub fn run(&self) -> std::io::Result<()> {
tracing::info!("Extraction started");
let diagnostics = diagnostics::DiagnosticLoggers::new(&self.prefix); let diagnostics = diagnostics::DiagnosticLoggers::new(&self.prefix);
let mut main_thread_logger = diagnostics.logger(); let mut main_thread_logger = diagnostics.logger();
let num_threads = match crate::options::num_threads() { let num_threads = match crate::options::num_threads() {
@@ -170,7 +171,9 @@ impl Extractor {
let mut trap_writer = trap::Writer::new(); let mut trap_writer = trap::Writer::new();
crate::extractor::populate_empty_location(&mut trap_writer); crate::extractor::populate_empty_location(&mut trap_writer);
write_trap(&self.trap_dir, &path, &trap_writer, trap_compression) let res = write_trap(&self.trap_dir, &path, &trap_writer, trap_compression);
tracing::info!("Extraction complete");
res
} }
} }