diff --git a/Cargo.lock b/Cargo.lock index 944f726..a5db651 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2162,7 +2162,7 @@ dependencies = [ [[package]] name = "socktop" -version = "0.1.3" +version = "0.1.4" dependencies = [ "anyhow", "assert_cmd", @@ -2187,7 +2187,7 @@ dependencies = [ [[package]] name = "socktop_agent" -version = "0.1.3" +version = "0.1.4" dependencies = [ "anyhow", "assert_cmd", diff --git a/socktop/Cargo.toml b/socktop/Cargo.toml index 89a61a8..d80fc1e 100644 --- a/socktop/Cargo.toml +++ b/socktop/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "socktop" -version = "0.1.3" +version = "0.1.4" authors = ["Jason Witty "] description = "Remote system monitor over WebSocket, TUI like top" edition = "2021" diff --git a/socktop/src/main.rs b/socktop/src/main.rs index 4127762..14ca816 100644 --- a/socktop/src/main.rs +++ b/socktop/src/main.rs @@ -124,19 +124,29 @@ async fn main() -> Result<(), Box> { return Ok(()); } }; + + //support version flag (print and exit) + if env::args().any(|a| a == "--version" || a == "-V") { + println!("socktop {}", env!("CARGO_PKG_VERSION")); + return Ok(()); + } + if parsed.demo || matches!(parsed.profile.as_deref(), Some("demo")) { return run_demo_mode(parsed.tls_ca.as_deref()).await; } + if parsed.verify_hostname { // Set env var consumed by ws::connect logic std::env::set_var("SOCKTOP_VERIFY_NAME", "1"); } + let profiles_file = load_profiles(); let req = ProfileRequest { profile_name: parsed.profile.clone(), url: parsed.url.clone(), tls_ca: parsed.tls_ca.clone(), }; + let resolved = req.resolve(&profiles_file); let mut profiles_mut = profiles_file.clone(); let (url, tls_ca, metrics_interval_ms, processes_interval_ms): ( diff --git a/socktop_agent/Cargo.toml b/socktop_agent/Cargo.toml index 79adaf1..d722d72 100644 --- a/socktop_agent/Cargo.toml +++ b/socktop_agent/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "socktop_agent" -version = "0.1.3" +version = "0.1.4" authors = ["Jason Witty "] description = "Remote system monitor over WebSocket, TUI like top" edition = "2021"