Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0b1d8c0a73 | |||
| c77aa6eaaa |
6
Cargo.lock
generated
6
Cargo.lock
generated
@@ -279,7 +279,7 @@ checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cm-dashboard"
|
name = "cm-dashboard"
|
||||||
version = "0.1.222"
|
version = "0.1.224"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"chrono",
|
"chrono",
|
||||||
@@ -301,7 +301,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cm-dashboard-agent"
|
name = "cm-dashboard-agent"
|
||||||
version = "0.1.222"
|
version = "0.1.224"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"async-trait",
|
"async-trait",
|
||||||
@@ -325,7 +325,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cm-dashboard-shared"
|
name = "cm-dashboard-shared"
|
||||||
version = "0.1.222"
|
version = "0.1.224"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"chrono",
|
"chrono",
|
||||||
"serde",
|
"serde",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "cm-dashboard-agent"
|
name = "cm-dashboard-agent"
|
||||||
version = "0.1.223"
|
version = "0.1.225"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
@@ -451,8 +451,10 @@ impl DiskCollector {
|
|||||||
|
|
||||||
let output_str = String::from_utf8_lossy(&output.stdout);
|
let output_str = String::from_utf8_lossy(&output.stdout);
|
||||||
|
|
||||||
if !output.status.success() {
|
// Note: smartctl returns non-zero exit codes for warnings (like exit code 32
|
||||||
// Return unknown data rather than failing completely
|
// for "temperature was high in the past"), but the output data is still valid.
|
||||||
|
// Only check if we got any output at all, don't reject based on exit code.
|
||||||
|
if output_str.is_empty() {
|
||||||
return Ok(SmartData {
|
return Ok(SmartData {
|
||||||
health: "UNKNOWN".to_string(),
|
health: "UNKNOWN".to_string(),
|
||||||
serial_number: None,
|
serial_number: None,
|
||||||
@@ -802,19 +804,12 @@ impl DiskCollector {
|
|||||||
// Extract base device name (e.g., "sda1" -> "sda")
|
// Extract base device name (e.g., "sda1" -> "sda")
|
||||||
let base_device = self.extract_base_device(&format!("/dev/{}", device));
|
let base_device = self.extract_base_device(&format!("/dev/{}", device));
|
||||||
|
|
||||||
// Get temperature from SMART data if available
|
// Temperature will be filled in later from parallel SMART collection
|
||||||
let temperature = if let Ok(smart_data) = tokio::task::block_in_place(|| {
|
// Don't collect it here to avoid sequential blocking with problematic async nesting
|
||||||
tokio::runtime::Handle::current().block_on(self.get_smart_data(&base_device))
|
|
||||||
}) {
|
|
||||||
smart_data.temperature_celsius
|
|
||||||
} else {
|
|
||||||
None
|
|
||||||
};
|
|
||||||
|
|
||||||
Ok(PoolDrive {
|
Ok(PoolDrive {
|
||||||
name: base_device,
|
name: base_device,
|
||||||
mount_point: path.to_string(),
|
mount_point: path.to_string(),
|
||||||
temperature_celsius: temperature,
|
temperature_celsius: None,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "cm-dashboard"
|
name = "cm-dashboard"
|
||||||
version = "0.1.223"
|
version = "0.1.225"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "cm-dashboard-shared"
|
name = "cm-dashboard-shared"
|
||||||
version = "0.1.223"
|
version = "0.1.225"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
Reference in New Issue
Block a user