jason/socktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: NVMe temperature detection - contains() check and /dev/ prefix

Browse Source
This commit is contained in:
jasonwitty 2025-10-06 11:40:49 -07:00
parent 47e96c7d92
commit 4196066e57
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
socktop_agent/src/metrics.rs
View File

@ -336,14 +336,16 @@ pub async fn collect_disks(state: &AppState) -> Vec<DiskInfo> {
// NVMe temps show up as "Composite" under different chip names // NVMe temps show up as "Composite" under different chip names
let disk_temps = { let disk_temps = {
let mut components = state.components.lock().await; let mut components = state.components.lock().await;
components.refresh(true); // true = refresh values, not just the list components.refresh(true); // true = refresh values, not just the list
let mut composite_temps = Vec::new(); let mut composite_temps = Vec::new();
for c in components.iter() { for c in components.iter() {
let label = c.label().to_ascii_lowercase(); let label = c.label().to_ascii_lowercase();
// Collect all "Composite" temperatures (these are NVMe drives) // Collect all "Composite" temperatures (these are NVMe drives)
if label == "composite" // Labels are like "nvme Composite CT1000N7BSS503" or "nvme Composite Sabrent Rocket 4.0"
if label.contains("composite")
&& let Some(temp) = c.temperature() && let Some(temp) = c.temperature()
{ {
tracing::debug!("Found Composite temp: {}°C", temp); tracing::debug!("Found Composite temp: {}°C", temp);
@ -440,8 +442,10 @@ pub async fn collect_disks(state: &AppState) -> Vec<DiskInfo> {
}; };
// Look up temperature for the PARENT disk, not the partition // Look up temperature for the PARENT disk, not the partition
// Strip /dev/ prefix if present for matching
let parent_name_for_match = parent_name.strip_prefix("/dev/").unwrap_or(parent_name);
let parent_temp = disk_temps.iter().find_map(|(key, &temp)| { let parent_temp = disk_temps.iter().find_map(|(key, &temp)| {
if parent_name.starts_with(key) { if parent_name_for_match.starts_with(key) {
Some(temp) Some(temp)
} else { } else {
None None