refactor(bundle): use tracing logging features

Author: cor

unionvisor/src/bundle.rs

@@ -9,7 +9,7 @@ use std::{
 use color_eyre::owo_colors::OwoColorize;
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
-use tracing::{debug, error, field::display as as_display};
+use tracing::{debug, error, field::display as as_display, info};
 
 /// Bundles should have the following structure on the filesystem:
 ///
@@ -127,11 +127,11 @@ pub struct BundleMeta {
 
 impl Display for Bundle {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        writeln!(f, "BUNDLE INFO")?;
-        writeln!(f, "┏━━━━━━━━━━━")?;
-        writeln!(f, "┃ bundle: {self:?}")?;
-        writeln!(f, "┃ genesis: {:?}", self.genesis_json().into_os_string())?;
-        writeln!(f, "┃ versions:")?;
+        // writeln!(f, "BUNDLE INFO")?;
+        // writeln!(f, "┏━━━━━━━━━━━")?;
+        // writeln!(f, "┃ bundle: {self:?}")?;
+        // writeln!(f, "┃ genesis: {:?}", self.genesis_json().into_os_string())?;
+        // writeln!(f, "┃ versions:")?;
 
         let versions =
             fs::read_dir(self.versions_path()).expect("can't read contents of versions path");
@@ -195,6 +195,19 @@ impl Bundle {
     }
 }
 
+pub fn log_bundle(bundle: &Bundle) {
+    let versions = fs::read_dir(bundle.versions_path())
+        .expect("can't read contents of versions path")
+        .map(|v| {
+            v.expect("can't read version in dir")
+                .path()
+                .into_os_string()
+        })
+        .collect::<Vec<_>>();
+
+    info!(target: "unionvisor", ?bundle, genesis=?bundle.genesis_json().into_os_string(), ?versions, "running with bundle" );
+}
+
 #[derive(Debug, Error)]
 pub enum NewBundleError {
     #[error("cannot read bundle/meta.json")]

unionvisor/src/cli.rs

@@ -13,7 +13,7 @@ use tracing::{field::display as as_display, info};
 use tracing_subscriber::filter::LevelFilter;
 
 use crate::{
-    bundle::{Bundle, NewBundleError, ValidateVersionPathError},
+    bundle::{log_bundle, Bundle, NewBundleError, ValidateVersionPathError},
     init::{self, SetSeedsError},
     logging::LogFormat,
     supervisor::{self, RuntimeError},
@@ -208,7 +208,9 @@ impl RunCmd {
     fn run(&self, root: impl Into<PathBuf>, logformat: LogFormat) -> Result<(), RunError> {
         let root = root.into();
         let bundle = Bundle::new(self.bundle.clone())?;
-        info!(target: "unionvisor", "running with bundle: {bundle}");
+
+        log_bundle(&bundle);
+
         let symlinker = Symlinker::new(root.clone(), bundle);
         supervisor::run_and_upgrade(
             root,

unionvisor/src/supervisor.rs

@@ -281,7 +281,10 @@ mod tests {
     use tracing_test::traced_test;
 
     use super::*;
-    use crate::{bundle::Bundle, testdata};
+    use crate::{
+        bundle::{log_bundle, Bundle},
+        testdata,
+    };
 
     #[test]
     #[traced_test]