Merge pull request #1542 from hirosystems/feat/log-devnet-no-dashboard

feat: log events in terminal if --no-dashboard
hirosystems · Aug 12, 2024 · b84e0d0 · b84e0d0
2 parents 5ecaee9 + 56fb603
commit b84e0d0
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 17 deletions.
diff --git a/components/clarinet-cli/src/frontend/cli.rs b/components/clarinet-cli/src/frontend/cli.rs
@@ -1860,7 +1860,7 @@ fn devnet_start(cmd: DevnetStart, global_settings: GlobalSettings) {
         }
     };
 
-    let orchestrator = match DevnetOrchestrator::new(manifest, None, None, true) {
+    let orchestrator = match DevnetOrchestrator::new(manifest, None, None, true, cmd.no_dashboard) {
         Ok(orchestrator) => orchestrator,
         Err(e) => {
             eprintln!("{}", format_err!(e));

diff --git a/components/stacks-devnet-js/src/lib.rs b/components/stacks-devnet-js/src/lib.rs
@@ -115,15 +115,16 @@ impl StacksDevnet {
             read_deployment_or_generate_default(&manifest, &StacksNetwork::Devnet)
                 .expect("Unable to generate deployment");
         let working_dir = devnet_overrides.working_dir.clone();
-        let devnet = match DevnetOrchestrator::new(manifest, None, Some(devnet_overrides), true) {
-            Ok(devnet) => devnet,
-            Err(message) => {
-                if logs_enabled {
-                    println!("Fatal error: {}", message);
+        let devnet =
+            match DevnetOrchestrator::new(manifest, None, Some(devnet_overrides), true, false) {
+                Ok(devnet) => devnet,
+                Err(message) => {
+                    if logs_enabled {
+                        println!("Fatal error: {}", message);
+                    }
+                    std::process::exit(1);
                 }
-                std::process::exit(1);
-            }
-        };
+            };
         let ctx: Option<Context> = match working_dir {
             Some(working_dir) => match PathBuf::from_str(&working_dir) {
                 Ok(mut log_path) => {

diff --git a/components/stacks-network/src/chains_coordinator.rs b/components/stacks-network/src/chains_coordinator.rs
@@ -353,6 +353,7 @@ pub async fn start_chains_coordinator(
                 send_status_update(
                     &devnet_event_tx,
                     enable_subnet_node,
+                    &None,
                     "bitcoin-node",
                     Status::Green,
                     &comment,
@@ -401,6 +402,7 @@ pub async fn start_chains_coordinator(
                 send_status_update(
                     &devnet_event_tx,
                     enable_subnet_node,
+                    &None,
                     "stacks-node",
                     Status::Green,
                     &format!(
@@ -473,6 +475,7 @@ pub async fn start_chains_coordinator(
                                 send_status_update(
                                     &devnet_event_tx,
                                     enable_subnet_node,
+                                    &None,
                                     "subnet-node",
                                     Status::Green,
                                     "⚡️",

diff --git a/components/stacks-network/src/event.rs b/components/stacks-network/src/event.rs
@@ -4,6 +4,7 @@ use chainhook_sdk::{
     observer::MempoolAdmissionData,
     types::{BitcoinChainEvent, StacksChainEvent},
 };
+use hiro_system_kit::slog;
 
 use crate::{
     chains_coordinator::BitcoinMiningCommand,
@@ -73,6 +74,7 @@ impl DevnetEvent {
 pub fn send_status_update(
     event_tx: &Sender<DevnetEvent>,
     with_subnets: bool,
+    logger: &Option<slog::Logger>,
     name: &str,
     status: Status,
     comment: &str,
@@ -94,12 +96,24 @@ pub fn send_status_update(
         _ => return,
     };
 
-    let _ = event_tx.send(DevnetEvent::ServiceStatus(ServiceStatusData {
-        order,
-        status,
-        name: name.into(),
-        comment: comment.into(),
-    }));
+    match logger {
+        None => {
+            let _ = event_tx.send(DevnetEvent::ServiceStatus(ServiceStatusData {
+                order,
+                status,
+                name: name.into(),
+                comment: comment.into(),
+            }));
+        }
+        Some(logger) => {
+            let msg = format!("{} - {}", name, comment);
+            match status {
+                Status::Green => slog::info!(logger, "{}", &msg),
+                Status::Yellow => slog::warn!(logger, "{}", &msg),
+                Status::Red => slog::error!(logger, "{}", &msg),
+            }
+        }
+    }
 }
 
 #[derive(Clone, Debug)]

diff --git a/components/stacks-network/src/main.rs b/components/stacks-network/src/main.rs
@@ -52,7 +52,8 @@ fn main() {
             .unwrap_or_else(|e| panic!("Devnet.toml file malformatted {:?}", e));
 
     let orchestrator =
-        DevnetOrchestrator::new(manifest, Some(network_manifest.clone()), None, false).unwrap();
+        DevnetOrchestrator::new(manifest, Some(network_manifest.clone()), None, false, false)
+            .unwrap();
 
     let deployment_specification_file_content = deployment_location
         .read_content()