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

added error handling in metrics handle

Browse Source
This commit is contained in:
Patrick Mahnke-Hartmann
2025-10-27 23:03:49 +01:00
parent 432a798210
commit 16020eea50
3 changed files with 60 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
WatcherAgent/src/docker/mod.rs
View File

@@ -159,43 +159,58 @@ impl DockerManager {
let container_infos: Vec<DockerCollectMetricDto> = container_infos_total
.into_iter()
.map(|info| DockerCollectMetricDto {
id: Some(info.container.unwrap().id).unwrap_or("".to_string()),
cpu: info
.cpu
.unwrap()
.cpu_usage_percent
.map(|load| DockerContainerCpuDto {
cpu_load: Some(load),
})
.unwrap_or(DockerContainerCpuDto { cpu_load: None }),
ram: info
.ram
.unwrap()
.memory_usage_percent
.map(|load| DockerContainerRamDto {
cpu_load: Some(load),
})
.unwrap_or(DockerContainerRamDto { cpu_load: None }),
network: DockerContainerNetworkDto {
net_in: info
.network
.as_ref()
.unwrap()
.rx_bytes
.map(|bytes| bytes as f64)
.or(Some(0.0)),
net_out: info
.network
.unwrap()
.tx_bytes
.map(|bytes| bytes as f64)
.or(Some(0.0)),
},
.filter_map(|info| {
// Safely handle container extraction
let container = match info.container {
Some(c) => c,
None => {
eprintln!("Warning: Container info missing container data, skipping");
return None;
}
};
// Safely handle CPU data with defaults
let cpu_dto = if let Some(cpu) = info.cpu {
DockerContainerCpuDto {
cpu_load: cpu.cpu_usage_percent,
}
} else {
DockerContainerCpuDto { cpu_load: None }
};
// Safely handle RAM data with defaults
let ram_dto = if let Some(ram) = info.ram {
DockerContainerRamDto {
ram_load: ram.memory_usage_percent,
}
} else {
DockerContainerRamDto { ram_load: None }
};
// Safely handle network data with defaults
let network_dto = if let Some(net) = info.network {
DockerContainerNetworkDto {
net_in: net.rx_bytes.map(|bytes| bytes as f64).or(Some(0.0)),
net_out: net.tx_bytes.map(|bytes| bytes as f64).or(Some(0.0)),
}
} else {
DockerContainerNetworkDto {
net_in: Some(0.0),
net_out: Some(0.0),
}
};
Some(DockerCollectMetricDto {
id: container.id,
cpu: cpu_dto,
ram: ram_dto,
network: network_dto,
})
})
.collect();
let dto = DockerMetricDto {
server_id: 0,
server_id: 0, // This should be set by the caller
containers: serde_json::to_string(&container_infos)?,
};
@@ -207,9 +222,9 @@ impl DockerManager {
) -> Result<DockerRegistrationDto, Box<dyn Error + Send + Sync>> {
let containers = self.get_containers().await?;
let dto = DockerRegistrationDto {
server_id: 0,
//container_count,
containers: serde_json::to_string(&containers)?,
server_id: 0, // This will be set by the caller
containers: serde_json::to_string(&containers)
.unwrap_or_else(|_| "[]".to_string()), // Fallback to empty array
};
Ok(dto)