changed all the println to use log::info | debug (#46)

* changed all the println to use log::info | debug * fix cargo fmt --------- Co-authored-by: Helio Frota <[email protected]>
trustification · Mar 11, 2024 · e2d6cc8 · e2d6cc8
1 parent bef5ced
commit e2d6cc8
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 28 deletions.
diff --git a/backend/api/src/system/advisory/csaf/mod.rs b/backend/api/src/system/advisory/csaf/mod.rs
@@ -51,7 +51,7 @@ impl AdvisoryContext {
                                 /*
                                 for purl in resolve_purls(&csaf, r) {
                                     let package = Purl::from(purl.clone());
-                                    println!("{}", package.to_string());
+                                    log::debug!("{}", package.to_string());
                                     //advisory_vulnerability
                                         //.ingest_affected_package_range(package, Transactional::None)
                                         //.await?;
@@ -117,7 +117,7 @@ mod tests {
             .vulnerability_assertions(Transactional::None)
             .await?;
 
-        println!("{:#?}", assertions);
+        log::info!("{:#?}", assertions);
 
         Ok(())
     }

diff --git a/backend/api/src/system/mod.rs b/backend/api/src/system/mod.rs
@@ -162,8 +162,8 @@ impl InnerSystem {
             host,
             port.into().unwrap_or(5432)
         );
-        println!("bootstrap to {}", url);
-        debug!("bootstrap to {}", url);
+        log::info!("bootstrap to {}", url);
+        log::debug!("bootstrap to {}", url);
         let db = Database::connect(url).await?;
 
         let drop_db_result = db

diff --git a/backend/api/src/system/sbom/mod.rs b/backend/api/src/system/sbom/mod.rs
@@ -618,7 +618,7 @@ impl SbomContext {
 
             Ok(related)
         } else {
-            println!("no package");
+            log::info!("no package");
             Ok(vec![])
         }
     }
@@ -774,31 +774,27 @@ mod tests {
         let sbom_v3 = system
             .ingest_sbom("http://sbom.com/test.json", "10", Transactional::None)
             .await?;
-        println!("a");
 
         sbom_v1
             .ingest_describes_cpe22(
                 cpe::uri::Uri::parse("cpe:/a:redhat:quarkus:2.13::el8")?,
                 Transactional::None,
             )
             .await?;
-        println!("b");
 
         sbom_v2
             .ingest_describes_cpe22(
                 cpe::uri::Uri::parse("cpe:/a:redhat:quarkus:2.13::el8")?,
                 Transactional::None,
             )
             .await?;
-        println!("c");
 
         sbom_v3
             .ingest_describes_cpe22(
                 cpe::uri::Uri::parse("cpe:/a:redhat:not-quarkus:2.13::el8")?,
                 Transactional::None,
             )
             .await?;
-        println!("d");
 
         let found = system
             .locate_sboms(

diff --git a/backend/api/src/system/sbom/spdx.rs b/backend/api/src/system/sbom/spdx.rs
@@ -38,14 +38,14 @@ impl SbomContext {
                         {
                             for reference in &described_package.external_reference {
                                 if reference.reference_type == "purl" {
-                                    //println!("describes pkg {}", reference.reference_locator);
+                                    //log::debug!("describes pkg {}", reference.reference_locator);
                                     sbom.ingest_describes_package(
                                         reference.reference_locator.clone(),
                                         tx,
                                     )
                                         .await?;
                                 } else if reference.reference_type == "cpe22Type" {
-                                    //println!("describes cpe22 {}", reference.reference_locator);
+                                    //log::debug!("describes cpe22 {}", reference.reference_locator);
                                     if let Ok(cpe) = cpe::uri::Uri::parse(&reference.reference_locator) {
                                         sbom.ingest_describes_cpe22(
                                             cpe,
@@ -64,7 +64,7 @@ impl SbomContext {
                                 for package_ref in &package_info.external_reference {
                                     if package_ref.reference_type == "purl" {
                                         let package_a = package_ref.reference_locator.clone();
-                                        //println!("pkg_a: {}", package_a);
+                                        //log::debug!("pkg_a: {}", package_a);
 
                                         for relationship in sbom_data
                                             .relationships_for_spdx_id(package_identifier)
@@ -208,7 +208,7 @@ mod tests {
         assert_eq!(1, described_cpe222.len());
 
         let described_packages = sbom.describes_packages(Transactional::None).await?;
-        println!("{:#?}", described_packages);
+        log::info!("{:#?}", described_packages);
 
         let contains = sbom
             .related_packages(
@@ -218,15 +218,15 @@ mod tests {
             )
             .await?;
 
-        println!("{}", contains.len());
+        log::info!("{}", contains.len());
 
         assert!(contains.len() > 500);
 
         let query_time = start.elapsed();
 
-        println!("parse {}ms", parse_time.as_millis());
-        println!("ingest {}ms", ingest_time.as_millis());
-        println!("query {}ms", query_time.as_millis());
+        log::info!("parse {}ms", parse_time.as_millis());
+        log::info!("ingest {}ms", ingest_time.as_millis());
+        log::info!("query {}ms", query_time.as_millis());
 
         Ok(())
     }
@@ -261,7 +261,7 @@ mod tests {
         assert_eq!(1, described_cpe222.len());
 
         let described_packages = sbom.describes_packages(Transactional::None).await?;
-        println!("{:#?}", described_packages);
+        log::info!("{:#?}", described_packages);
 
         let contains = sbom
             .related_packages(
@@ -277,9 +277,9 @@ mod tests {
 
         let query_time = start.elapsed();
 
-        println!("parse {}ms", parse_time.as_millis());
-        println!("ingest {}ms", ingest_time.as_millis());
-        println!("query {}ms", query_time.as_millis());
+        log::info!("parse {}ms", parse_time.as_millis());
+        log::info!("ingest {}ms", ingest_time.as_millis());
+        log::info!("query {}ms", query_time.as_millis());
 
         Ok(())
     }
@@ -321,15 +321,15 @@ mod tests {
             )
             .await?;
 
-        println!("{}", contains.len());
+        log::info!("{}", contains.len());
 
         assert!(contains.len() > 500);
 
         let query_time = start.elapsed();
 
-        println!("parse {}ms", parse_time.as_millis());
-        println!("ingest {}ms", ingest_time.as_millis());
-        println!("query {}ms", query_time.as_millis());
+        log::info!("parse {}ms", parse_time.as_millis());
+        log::info!("ingest {}ms", ingest_time.as_millis());
+        log::info!("query {}ms", query_time.as_millis());
 
         Ok(())
     }

diff --git a/backend/cli/src/main.rs b/backend/cli/src/main.rs
@@ -26,12 +26,12 @@ impl Cli {
         match self.run_command().await {
             Ok(code) => code,
             Err(err) => {
-                eprintln!("Error: {err}");
+                log::info!("Error: {err}");
                 for (n, err) in err.chain().skip(1).enumerate() {
                     if n == 0 {
-                        eprintln!("Caused by:");
+                        log::info!("Caused by:");
                     }
-                    eprintln!("\t{err}");
+                    log::info!("\t{err}");
                 }
 
                 ExitCode::FAILURE