Improve log output.

src/activate/etc_files.rs

@@ -17,6 +17,8 @@ use crate::{
 };
 use etc_tree::EtcTree;
 
+use self::etc_tree::EtcFileStatus;
+
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct EtcFile {
@@ -38,6 +40,21 @@ struct EtcFilesConfig {
     static_env: StorePath,
 }
 
+impl std::fmt::Display for EtcFilesConfig {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        writeln!(f, "Files in config:")?;
+        self.entries.values().try_for_each(|entry| {
+            writeln!(
+                f,
+                "target: {}, source:{}, mode:{}",
+                entry.target.display(),
+                entry.source,
+                entry.mode
+            )
+        })
+    }
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct CreatedEtcFile {
@@ -49,10 +66,10 @@ pub fn activate(store_path: &StorePath, ephemeral: bool) -> Result<()> {
     let file = fs::File::open(Path::new(&store_path.store_path).join("etcFiles/etcFiles.json"))?;
     let reader = io::BufReader::new(file);
     let config: EtcFilesConfig = serde_json::from_reader(reader)?;
-    log::debug!("{:?}", config);
+    log::debug!("{config}");
 
     let etc_dir = etc_dir(ephemeral);
-    log::debug!("Storing /etc entries in {}", etc_dir.display());
+    log::info!("Creating /etc entries in {}", etc_dir.display());
 
     DirBuilder::new().recursive(true).create(&etc_dir)?;
 

src/activate/services.rs

@@ -19,6 +19,17 @@ struct ServiceConfig {
 
 type Services = HashMap<String, ServiceConfig>;
 
+fn print_services(services: &Services) -> Result<String> {
+    use std::fmt::Write as _;
+
+    let mut out = String::new();
+    writeln!(out, "Services in config:")?;
+    services
+        .iter()
+        .try_for_each(|(name, entry)| writeln!(out, "name: {name}, source:{}", entry.store_path))?;
+    Ok(out)
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct LinkedServiceConfig {
@@ -45,7 +56,6 @@ type LinkedServices = HashMap<String, LinkedServiceConfig>;
 
 pub fn activate(store_path: &StorePath, ephemeral: bool) -> Result<()> {
     let old_linked_services = read_linked_services()?;
-    log::debug!("{:?}", old_linked_services);
 
     log::info!("Reading service definitions...");
     let file = fs::File::open(
@@ -55,6 +65,7 @@ pub fn activate(store_path: &StorePath, ephemeral: bool) -> Result<()> {
     )?;
     let reader = io::BufReader::new(file);
     let services: Services = serde_json::from_reader(reader)?;
+    log::debug!("{}", print_services(&services)?);
 
     let linked_services = link_services(services, ephemeral)?;
     serialise_linked_services(&linked_services)?;