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

cargo fmt

Browse Source
This commit is contained in:
jasonwitty 2025-08-21 13:49:36 -07:00
parent 9491dc50a8
commit 0275b1871d
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
socktop/src/main.rs
View File

@ -154,7 +154,9 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
ResolveProfile::Loaded(u, t) => (u, t), ResolveProfile::Loaded(u, t) => (u, t),
ResolveProfile::PromptSelect(mut names) => { ResolveProfile::PromptSelect(mut names) => {
// Always add demo option to list // Always add demo option to list
if !names.iter().any(|n| n == "demo") { names.push("demo".into()); } if !names.iter().any(|n| n == "demo") {
names.push("demo".into());
}
eprintln!("Select profile:"); eprintln!("Select profile:");
for (i, n) in names.iter().enumerate() { for (i, n) in names.iter().enumerate() {
eprintln!(" {}. {}", i + 1, n); eprintln!(" {}. {}", i + 1, n);
@ -166,7 +168,9 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
if let Ok(idx) = line.trim().parse::<usize>() { if let Ok(idx) = line.trim().parse::<usize>() {
if idx >= 1 && idx <= names.len() { if idx >= 1 && idx <= names.len() {
let name = &names[idx - 1]; let name = &names[idx - 1];
if name == "demo" { return run_demo_mode(parsed.tls_ca.as_deref()).await; } if name == "demo" {
return run_demo_mode(parsed.tls_ca.as_deref()).await;
}
if let Some(entry) = profiles_mut.profiles.get(name) { if let Some(entry) = profiles_mut.profiles.get(name) {
(entry.url.clone(), entry.tls_ca.clone()) (entry.url.clone(), entry.tls_ca.clone())
} else { } else {
@ -252,7 +256,13 @@ async fn run_demo_mode(_tls_ca: Option<&str>) -> Result<(), Box<dyn std::error::
} }
struct DemoGuard(std::sync::Arc<std::sync::Mutex<Option<std::process::Child>>>); struct DemoGuard(std::sync::Arc<std::sync::Mutex<Option<std::process::Child>>>);
impl Drop for DemoGuard { fn drop(&mut self) { if let Some(mut ch) = self.0.lock().unwrap().take() { let _ = ch.kill(); } } } impl Drop for DemoGuard {
fn drop(&mut self) {
if let Some(mut ch) = self.0.lock().unwrap().take() {
let _ = ch.kill();
}
}
}
fn spawn_demo_agent(port: u16) -> Result<DemoGuard, Box<dyn std::error::Error>> { fn spawn_demo_agent(port: u16) -> Result<DemoGuard, Box<dyn std::error::Error>> {
let candidate = find_agent_executable(); let candidate = find_agent_executable();
@ -264,7 +274,9 @@ fn spawn_demo_agent(port: u16) -> Result<DemoGuard, Box<dyn std::error::Error>>
let child = cmd.spawn()?; let child = cmd.spawn()?;
// Give the agent a brief moment to start // Give the agent a brief moment to start
std::thread::sleep(std::time::Duration::from_millis(300)); std::thread::sleep(std::time::Duration::from_millis(300));
Ok(DemoGuard(std::sync::Arc::new(std::sync::Mutex::new(Some(child))))) Ok(DemoGuard(std::sync::Arc::new(std::sync::Mutex::new(Some(
child,
)))))
} }
fn find_agent_executable() -> std::path::PathBuf { fn find_agent_executable() -> std::path::PathBuf {
@ -276,7 +288,9 @@ fn find_agent_executable() -> std::path::PathBuf {
#[cfg(not(windows))] #[cfg(not(windows))]
let name = "socktop_agent"; let name = "socktop_agent";
let candidate = parent.join(name); let candidate = parent.join(name);
if candidate.exists() { return candidate; } if candidate.exists() {
return candidate;
}
} }
} }
// Fallback to relying on PATH // Fallback to relying on PATH