diff --git a/bin/core/src/api/execute/build.rs b/bin/core/src/api/execute/build.rs index 6cc97ee86..12f933c62 100644 --- a/bin/core/src/api/execute/build.rs +++ b/bin/core/src/api/execute/build.rs @@ -499,14 +499,10 @@ pub async fn validate_cancel_build( match (latest_build, latest_cancel) { (Some(build), Some(cancel)) => { if cancel.start_ts > build.start_ts { - return Err( - anyhow!("Build has already been cancelled"), - ); + return Err(anyhow!("Build has already been cancelled")); } } - (None, _) => { - return Err(anyhow!("No build in progress")) - } + (None, _) => return Err(anyhow!("No build in progress")), _ => {} }; } diff --git a/bin/core/src/helpers/builder.rs b/bin/core/src/helpers/builder.rs index 8d3cd0684..9d6f2467a 100644 --- a/bin/core/src/helpers/builder.rs +++ b/bin/core/src/helpers/builder.rs @@ -122,8 +122,11 @@ async fn get_aws_builder( let protocol = if config.use_https { "https" } else { "http" }; let periphery_address = format!("{protocol}://{ip}:{}", config.port); - let periphery = - PeripheryClient::new(&periphery_address, &core_config().passkey, Duration::from_secs(3)); + let periphery = PeripheryClient::new( + &periphery_address, + &core_config().passkey, + Duration::from_secs(3), + ); let start_connect_ts = komodo_timestamp(); let mut res = Ok(GetVersionResponse { diff --git a/bin/core/src/monitor/record.rs b/bin/core/src/monitor/record.rs index 213f92b05..8c072977b 100644 --- a/bin/core/src/monitor/record.rs +++ b/bin/core/src/monitor/record.rs @@ -28,7 +28,9 @@ pub async fn record_server_stats(ts: i64) { disks: stats.disks.clone(), network_ingress_bytes: stats.network_ingress_bytes, network_egress_bytes: stats.network_egress_bytes, - network_usage_interface: stats.network_usage_interface.clone(), + network_usage_interface: stats + .network_usage_interface + .clone(), }) }) .collect::>(); diff --git a/bin/periphery/src/api/stats.rs b/bin/periphery/src/api/stats.rs index 9f4429fbe..63cd2cee2 100644 --- a/bin/periphery/src/api/stats.rs +++ b/bin/periphery/src/api/stats.rs @@ -45,4 +45,3 @@ impl Resolve for GetSystemProcesses { Ok(stats_client().read().await.get_processes()) } } - diff --git a/bin/periphery/src/stats.rs b/bin/periphery/src/stats.rs index 4181f3de9..a472a5873 100644 --- a/bin/periphery/src/stats.rs +++ b/bin/periphery/src/stats.rs @@ -2,7 +2,8 @@ use std::{cmp::Ordering, sync::OnceLock}; use async_timing_util::wait_until_timelength; use komodo_client::entities::stats::{ - SingleDiskUsage, SystemInformation, SystemProcess, SystemStats, SingleNetworkInterfaceUsage, + SingleDiskUsage, SingleNetworkInterfaceUsage, SystemInformation, + SystemProcess, SystemStats, }; use sysinfo::{ProcessesToUpdate, System}; use tokio::sync::RwLock; @@ -35,7 +36,6 @@ pub fn spawn_system_stats_polling_thread() { }); } - pub struct StatsClient { /// Cached system stats pub stats: SystemStats, @@ -85,27 +85,28 @@ impl StatsClient { let available_mem = self.system.available_memory(); let mut total_ingress: u64 = 0; - let mut total_egress: u64 = 0; + let mut total_egress: u64 = 0; // Fetch network data (Ingress and Egress) - let network_usage: Vec = self.networks - .iter() - .map(|(interface_name, network)| { - let ingress = network.received(); - let egress = network.transmitted(); + let network_usage: Vec = self + .networks + .iter() + .map(|(interface_name, network)| { + let ingress = network.received(); + let egress = network.transmitted(); - // Update total ingress and egress - total_ingress += ingress; - total_egress += egress; + // Update total ingress and egress + total_ingress += ingress; + total_egress += egress; - // Return per-interface network stats - SingleNetworkInterfaceUsage { - name: interface_name.clone(), - ingress_bytes: ingress as f64, - egress_bytes: egress as f64, - } - }) - .collect(); + // Return per-interface network stats + SingleNetworkInterfaceUsage { + name: interface_name.clone(), + ingress_bytes: ingress as f64, + egress_bytes: egress as f64, + } + }) + .collect(); SystemStats { cpu_perc: self.system.global_cpu_usage(), diff --git a/client/core/rs/src/entities/stats.rs b/client/core/rs/src/entities/stats.rs index 69bdc4fed..7d4d84edf 100644 --- a/client/core/rs/src/entities/stats.rs +++ b/client/core/rs/src/entities/stats.rs @@ -51,15 +51,15 @@ pub struct SystemStatsRecord { pub disk_total_gb: f64, /// Breakdown of individual disks, ie their usages, sizes, and mount points pub disks: Vec, - /// Network ingress usage in bytes - #[serde(default)] - pub network_ingress_bytes: f64, - /// Network egress usage in bytes - #[serde(default)] - pub network_egress_bytes: f64, - /// Network usage by interface name (ingress, egress in bytes) - #[serde(default)] - pub network_usage_interface: Vec, // interface -> (ingress, egress) + /// Network ingress usage in bytes + #[serde(default)] + pub network_ingress_bytes: f64, + /// Network egress usage in bytes + #[serde(default)] + pub network_egress_bytes: f64, + /// Network usage by interface name (ingress, egress in bytes) + #[serde(default)] + pub network_usage_interface: Vec, // interface -> (ingress, egress) } /// Realtime system stats data.