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

Fix remaining clippy warnings in socktop_agent

Browse Source
This commit is contained in:
jasonwitty 2025-09-04 06:04:57 -07:00
parent 764c25846f
commit eed04f1d5c
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
socktop_agent/src/metrics.rs
View File

@ -74,11 +74,11 @@ fn cached_temp() -> Option<f32> {
} }
fn set_temp(v: Option<f32>) { fn set_temp(v: Option<f32>) {
if let Some(lock) = TEMP.get() { if let Some(lock) = TEMP.get()
if let Ok(mut c) = lock.lock() { && let Ok(mut c) = lock.lock()
c.v = v; {
c.at = Some(Instant::now()); c.v = v;
} c.at = Some(Instant::now());
} }
} }
@ -98,11 +98,11 @@ fn cached_gpus() -> Option<Vec<crate::gpu::GpuMetrics>> {
} }
fn set_gpus(v: Option<Vec<crate::gpu::GpuMetrics>>) { fn set_gpus(v: Option<Vec<crate::gpu::GpuMetrics>>) {
if let Some(lock) = GPUC.get() { if let Some(lock) = GPUC.get()
if let Ok(mut c) = lock.lock() { && let Ok(mut c) = lock.lock()
c.v = v.clone(); {
c.at = Some(Instant::now()); c.v = v.clone();
} c.at = Some(Instant::now());
} }
} }
@ -116,10 +116,10 @@ pub async fn collect_fast_metrics(state: &AppState) -> Metrics {
let ttl = StdDuration::from_millis(ttl_ms); let ttl = StdDuration::from_millis(ttl_ms);
{ {
let cache = state.cache_metrics.lock().await; let cache = state.cache_metrics.lock().await;
if cache.is_fresh(ttl) { if cache.is_fresh(ttl)
if let Some(c) = cache.get() { && let Some(c) = cache.get()
return c.clone(); {
} return c.clone();
} }
} }
let mut sys = state.sys.lock().await; let mut sys = state.sys.lock().await;
@ -278,10 +278,10 @@ pub async fn collect_disks(state: &AppState) -> Vec<DiskInfo> {
let ttl = StdDuration::from_millis(ttl_ms); let ttl = StdDuration::from_millis(ttl_ms);
{ {
let cache = state.cache_disks.lock().await; let cache = state.cache_disks.lock().await;
if cache.is_fresh(ttl) { if cache.is_fresh(ttl)
if let Some(v) = cache.get() { && let Some(v) = cache.get()
return v.clone(); {
} return v.clone();
} }
} }
let mut disks_list = state.disks.lock().await; let mut disks_list = state.disks.lock().await;
@ -347,10 +347,10 @@ pub async fn collect_processes_all(state: &AppState) -> ProcessesPayload {
let ttl = StdDuration::from_millis(ttl_ms); let ttl = StdDuration::from_millis(ttl_ms);
{ {
let cache = state.cache_processes.lock().await; let cache = state.cache_processes.lock().await;
if cache.is_fresh(ttl) { if cache.is_fresh(ttl)
if let Some(c) = cache.get() { && let Some(c) = cache.get()
return c.clone(); {
} return c.clone();
} }
} }
// Reuse shared System to avoid reallocation; refresh processes fully. // Reuse shared System to avoid reallocation; refresh processes fully.

12
socktop_agent/src/ws.rs
View File

@ -40,12 +40,12 @@ pub async fn ws_handler(
Query(q): Query<HashMap<String, String>>, Query(q): Query<HashMap<String, String>>,
) -> Response { ) -> Response {
// optional auth // optional auth
if let Some(expected) = state.auth_token.as_ref() { if let Some(expected) = state.auth_token.as_ref()
if q.get("token") != Some(expected) { && q.get("token") != Some(expected)
return ws.on_upgrade(|socket| async move { {
let _ = socket.close().await; return ws.on_upgrade(|socket| async move {
}); let _ = socket.close().await;
} });
} }
ws.on_upgrade(move |socket| handle_socket(socket, state)) ws.on_upgrade(move |socket| handle_socket(socket, state))
} }