donpat1to/watcheragent
1
0
Fork 0
Code Issues 8 Pull Requests Actions Packages Projects 1 Releases 1 Wiki Activity

deleted duplicate in .toml

Browse Source
This commit is contained in:
Patrick Mahnke-Hartmann
2025-07-29 11:36:02 +02:00
parent d4fb3eb441
commit a7d8c4fb33
2 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
WatcherAgent/Cargo.toml
View File

@@ -8,11 +8,11 @@ license = "MIT"
[dependencies] [dependencies]
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_json = "1" serde_json = "1.0"
tokio = { version = "1.37", features = ["full"] } tokio = { version = "1.37", features = ["full"] }
local-ip-address = "0.5" local-ip-address = "0.5"
reqwest = { version = "0.11", default-features = false, features = ["json", "blocking", "cookies", "rustls-tls"] } reqwest = { version = "0.11", default-features = false, features = ["json", "blocking", "cookies", "rustls-tls"] }
sysinfo = "0.30" sysinfo = "0.29"
metrics = "0.24.2" metrics = "0.24.2"
chrono = "0.4" chrono = "0.4"
nvml-wrapper = "0.10" nvml-wrapper = "0.10"

15
WatcherAgent/src/main.rs
View File

@@ -3,9 +3,7 @@ use nvml_wrapper::Nvml;
use reqwest::Client; use reqwest::Client;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::{error::Error, fs, process::Command, time::Duration}; use std::{error::Error, fs, process::Command, time::Duration};
use sysinfo::{ use sysinfo::{CpuExt, DiskExt, System, SystemExt};
CpuExt, CpuRefreshKind, DiskExt, MacAddr, MemoryRefreshKind, RefreshKind, System, SystemExt,
};
use tokio::time::{interval, sleep}; use tokio::time::{interval, sleep};
// Shared data structures // Shared data structures
@@ -67,12 +65,7 @@ struct HardwareInfo {
impl HardwareInfo { impl HardwareInfo {
async fn collect() -> Result<Self, Box<dyn Error>> { async fn collect() -> Result<Self, Box<dyn Error>> {
let mut sys = System::new_with_specifics( let mut sys = System::new();
RefreshKind::new()
.with_cpu(CpuRefreshKind::everything())
.with_memory(MemoryRefreshKind::everything()),
);
sys.refresh_cpu(); sys.refresh_cpu();
sys.refresh_memory(); sys.refresh_memory();
@@ -223,7 +216,7 @@ struct MetricsCollector {
impl MetricsCollector { impl MetricsCollector {
fn new(server_id: i32) -> Self { fn new(server_id: i32) -> Self {
Self { Self {
sys: System::new_all(), sys: System::new(),
nvml: Nvml::init().ok(), nvml: Nvml::init().ok(),
server_id, server_id,
} }
@@ -309,7 +302,7 @@ impl MetricsCollector {
gpu_vram_size: vram_total, gpu_vram_size: vram_total,
gpu_vram_usage: vram_used, gpu_vram_usage: vram_used,
ram_load, ram_load,
ram_size: (total_memory as f32 / 1024.0) as u32, ram_size: (total_memory / 1024) as u32,
disk_size: disk_size as u32, disk_size: disk_size as u32,
disk_usage: disk_used, disk_usage: disk_used,
disk_temp: 0.0, disk_temp: 0.0,