slight log change

Author: erhant

Cargo.lock

@@ -4,7 +4,7 @@ members = ["compute", "p2p", "workflows", "utils", "monitor"]
 
 [workspace.package]
 edition = "2021"
-version = "0.2.25"
+version = "0.2.26"
 license = "Apache-2.0"
 readme = "README.md"
 

Cargo.toml

@@ -15,6 +15,7 @@ use crate::{
     handlers::*,
     utils::{crypto::secret_to_keypair, refresh_dria_nodes, DriaMessage},
     workers::workflow::{WorkflowsWorker, WorkflowsWorkerInput, WorkflowsWorkerOutput},
+    DRIA_COMPUTE_NODE_VERSION,
 };
 
 /// Number of seconds between refreshing for diagnostic prints.
@@ -413,22 +414,34 @@ impl DriaComputeNode {
 
     /// Peer refresh simply reports the peer count to the user.
     async fn handle_diagnostic_refresh(&self) {
+        let mut diagnostics = Vec::new();
         // print peer counts
         match self.p2p.peer_counts().await {
-            Ok((mesh, all)) => log::info!("Peer Count (mesh/all): {} / {}", mesh, all),
+            Ok((mesh, all)) => {
+                diagnostics.push(format!("Peer Count (mesh/all): {} / {}", mesh, all))
+            }
             Err(e) => log::error!("Error getting peer counts: {:?}", e),
         }
 
         // print tasks count
         let [single, batch] = self.get_pending_task_count();
-        log::info!("Pending Tasks (single/batch): {} / {}", single, batch);
-
-        // completed tasks count
-        log::debug!(
-            "Completed Tasks (single/batch): {} / {}",
-            self.completed_tasks_single,
-            self.completed_tasks_batch
-        );
+        diagnostics.push(format!(
+            "Pending Tasks (single/batch): {} / {}",
+            single, batch
+        ));
+
+        // completed tasks count is printed as well in debug
+        if log::log_enabled!(log::Level::Debug) {
+            diagnostics.push(format!(
+                "Completed Tasks (single/batch): {} / {}",
+                self.completed_tasks_single, self.completed_tasks_batch
+            ));
+        }
+
+        // print version
+        diagnostics.push(format!("Version: v{}", DRIA_COMPUTE_NODE_VERSION));
+
+        log::info!("{}", diagnostics.join(" | "));
     }
 
     /// Updates the local list of available nodes by refreshing it.

compute/src/node.rs

@@ -5,7 +5,7 @@ use eyre::Result;
 /// Refresh available nodes using the API.
 pub async fn refresh_dria_nodes(nodes: &mut DriaNodes) -> Result<()> {
     #[derive(serde::Deserialize, Debug)]
-    struct AvailableNodesApiResponse {
+    struct DriaNodesApiResponse {
         pub bootstraps: Vec<String>,
         pub relays: Vec<String>,
         pub rpcs: Vec<String>,
@@ -22,7 +22,7 @@ pub async fn refresh_dria_nodes(nodes: &mut DriaNodes) -> Result<()> {
 
     // make the request
     let response = reqwest::get(url).await?;
-    let response_body = response.json::<AvailableNodesApiResponse>().await?;
+    let response_body = response.json::<DriaNodesApiResponse>().await?;
     nodes
         .bootstrap_nodes
         .extend(parse_vec(response_body.bootstraps).unwrap_or_else(|e| {

compute/src/utils/nodes.rs

@@ -23,8 +23,8 @@ impl DriaNodes {
         Self {
             bootstrap_nodes: HashSet::new(),
             relay_nodes: HashSet::new(),
-            rpc_peerids: HashSet::new(),
             rpc_nodes: HashSet::new(),
+            rpc_peerids: HashSet::new(),
             network,
         }
     }