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

clippy fixes.

Browse Source
This commit is contained in:
jasonwitty 2025-08-19 15:52:30 -07:00
parent d346c61c28
commit 10501168c5
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
socktop/src/ws.rs
View File

@ -4,11 +4,10 @@ use flate2::bufread::GzDecoder;
use futures_util::{SinkExt, StreamExt}; use futures_util::{SinkExt, StreamExt};
use rustls::{ClientConfig, RootCertStore}; use rustls::{ClientConfig, RootCertStore};
use rustls_pemfile::Item; use rustls_pemfile::Item;
use std::io::{Cursor, Read}; use std::io::{Read};
use std::sync::OnceLock;
use std::{fs::File, io::BufReader, sync::Arc}; use std::{fs::File, io::BufReader, sync::Arc};
use tokio::net::TcpStream; use tokio::net::TcpStream;
use tokio::time::{interval, timeout, Duration}; use tokio::time::{interval, Duration};
use tokio_tungstenite::{ use tokio_tungstenite::{
connect_async, connect_async_tls_with_config, tungstenite::client::IntoClientRequest, connect_async, connect_async_tls_with_config, tungstenite::client::IntoClientRequest,
tungstenite::Message, Connector, MaybeTlsStream, WebSocketStream, tungstenite::Message, Connector, MaybeTlsStream, WebSocketStream,
@ -57,15 +56,6 @@ async fn connect_with_ca(url: &str, ca_path: &str) -> Result<WsStream, Box<dyn s
Ok(ws) Ok(ws)
} }
#[inline]
fn debug_on() -> bool {
static ON: OnceLock<bool> = OnceLock::new();
*ON.get_or_init(|| {
std::env::var("SOCKTOP_DEBUG")
.map(|v| v != "0")
.unwrap_or(false)
})
}
// Send a "get_metrics" request and await a single JSON reply // Send a "get_metrics" request and await a single JSON reply
pub async fn request_metrics(ws: &mut WsStream) -> Option<Metrics> { pub async fn request_metrics(ws: &mut WsStream) -> Option<Metrics> {

6
socktop/tests/ws_probe.rs
View File

@ -15,7 +15,11 @@ async fn probe_ws_endpoints() {
} }
}; };
let mut ws = connect(&url).await.expect("connect ws"); // Optional pinned CA for WSS/self-signed setups
let tls_ca = std::env::var("SOCKTOP_TLS_CA").ok();
let mut ws = connect(&url, tls_ca.as_deref())
.await
.expect("connect ws");
// Should get fast metrics quickly // Should get fast metrics quickly
let m = request_metrics(&mut ws).await; let m = request_metrics(&mut ws).await;