From 2e8cc24e81ff12c6b423e491143da08d8b76eb5e Mon Sep 17 00:00:00 2001 From: jasonwitty Date: Sat, 16 Aug 2025 17:31:32 -0700 Subject: [PATCH] remove dead code and increment version --- Cargo.lock | 4 +-- socktop/Cargo.toml | 2 +- socktop/src/ws.rs | 57 +--------------------------------------- socktop_agent/Cargo.toml | 2 +- 4 files changed, 5 insertions(+), 60 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index eedc293..5a5d683 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1518,7 +1518,7 @@ dependencies = [ [[package]] name = "socktop" -version = "0.1.1" +version = "0.1.11" dependencies = [ "anyhow", "chrono", @@ -1537,7 +1537,7 @@ dependencies = [ [[package]] name = "socktop_agent" -version = "0.1.1" +version = "0.1.11" dependencies = [ "axum", "flate2", diff --git a/socktop/Cargo.toml b/socktop/Cargo.toml index 9c8c7cf..24e6547 100644 --- a/socktop/Cargo.toml +++ b/socktop/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "socktop" -version = "0.1.1" +version = "0.1.11" authors = ["Jason Witty "] description = "Remote system monitor over WebSocket, TUI like top" edition = "2021" diff --git a/socktop/src/ws.rs b/socktop/src/ws.rs index 0298773..fb738e7 100644 --- a/socktop/src/ws.rs +++ b/socktop/src/ws.rs @@ -5,7 +5,7 @@ use futures_util::{SinkExt, StreamExt}; use std::io::{Cursor, Read}; use std::sync::OnceLock; use tokio::net::TcpStream; -use tokio::time::{interval, timeout, Duration}; +use tokio::time::{timeout, Duration}; use tokio_tungstenite::{connect_async, tungstenite::Message, MaybeTlsStream, WebSocketStream}; use crate::types::{DiskInfo, Metrics, ProcessesPayload}; @@ -85,7 +85,6 @@ pub enum Payload { Processes(ProcessesPayload), } -#[allow(dead_code)] fn parse_any_payload(json: &str) -> Result { if let Ok(m) = serde_json::from_str::(json) { return Ok(Payload::Metrics(m)); @@ -251,57 +250,3 @@ pub async fn request_processes(ws: &mut WsStream) -> Option { } None } - -#[allow(dead_code)] -pub async fn start_ws_polling(mut ws: WsStream) { - let mut t_fast = interval(Duration::from_millis(500)); - let mut t_procs = interval(Duration::from_secs(2)); - let mut t_disks = interval(Duration::from_secs(5)); - - let _ = ws.send(Message::Text("get_metrics".into())).await; - let _ = ws.send(Message::Text("get_processes".into())).await; - let _ = ws.send(Message::Text("get_disks".into())).await; - - loop { - tokio::select! { - _ = t_fast.tick() => { - let _ = ws.send(Message::Text("get_metrics".into())).await; - } - _ = t_procs.tick() => { - let _ = ws.send(Message::Text("get_processes".into())).await; - } - _ = t_disks.tick() => { - let _ = ws.send(Message::Text("get_disks".into())).await; - } - maybe = ws.next() => { - let Some(result) = maybe else { break; }; - let Ok(msg) = result else { break; }; - if debug_on() { log_msg(&msg); } - match msg { - Message::Binary(b) => { - if let Some(json) = gunzip_to_string(&b) { - if let Ok(payload) = parse_any_payload(&json) { - match payload { - Payload::Metrics(_m) => {}, - Payload::Disks(_d) => {}, - Payload::Processes(_p) => {}, - } - } - } - } - Message::Text(s) => { - if let Ok(payload) = parse_any_payload(&s) { - match payload { - Payload::Metrics(_m) => {}, - Payload::Disks(_d) => {}, - Payload::Processes(_p) => {}, - } - } - } - Message::Close(_) => break, - _ => {} - } - } - } - } -} diff --git a/socktop_agent/Cargo.toml b/socktop_agent/Cargo.toml index 273022b..f7863a8 100644 --- a/socktop_agent/Cargo.toml +++ b/socktop_agent/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "socktop_agent" -version = "0.1.1" +version = "0.1.11" authors = ["Jason Witty "] description = "Remote system monitor over WebSocket, TUI like top" edition = "2021"