Hexor/rexec
1
0
Fork 0
mirror of https://github.com/house-of-vanity/rexec.git synced 2025-07-06 16:44:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improved live logging

Browse Source
This commit is contained in:
Ultradesu
2025-06-27 14:04:20 +03:00
parent 6dc2ab74b6
commit ce76efad12
3 changed files with 160 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Cargo.lock generated
View File

@ -266,6 +266,12 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2a61bcce320b4968c46542aabe3d14e4d40ad6a6089eeced644326e73f6279a"
[[package]]
name = "lazy_static"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
[[package]]
name = "libc"
version = "0.2.172"
@ -404,6 +410,7 @@ dependencies = [
"env_logger",
"itertools",
"lazy-st",
"lazy_static",
"log",
"question",
"rayon",

3
Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "rexec"
version = "1.4.0"
version = "1.5.0"
readme = "https://github.com/house-of-vanity/rexec#readme"
edition = "2021"
description = "Parallel SSH executor"
@ -25,3 +25,4 @@ colored = "3"
itertools = "0.14"
brace-expand = "0.1.0"
question = "0.2.2"
lazy_static = "1.5.0"

132
src/main.rs
View File

@ -13,11 +13,17 @@ use colored::*;
use dns_lookup::lookup_host;
use env_logger::Env;
use itertools::Itertools;
use lazy_static::lazy_static;
use log::{error, info, warn};
use question::{Answer, Question};
use rayon::prelude::*;
use regex::Regex;
// Global state to track the currently open block
lazy_static! {
static ref CURRENT_BLOCK: Arc<Mutex<Option<String>>> = Arc::new(Mutex::new(None));
}
// Define command-line arguments using the clap library
#[derive(Parser, Debug)]
#[command(author = "AB ab@hexor.ru", version, about = "Parallel SSH executor in Rust", long_about = None)]
@ -146,7 +152,7 @@ fn shorten_hostname(hostname: &str, common_suffix: &Option<String>) -> String {
Some(suffix) if hostname.ends_with(suffix) => {
let short_name = hostname[..hostname.len() - suffix.len()].to_string();
format!("{}{}", short_name, "*")
},
}
_ => hostname.to_string(),
}
}
@ -281,20 +287,26 @@ fn expand_string(s: &str) -> Vec<Host> {
///
/// # Returns
/// * `Result<i32, String>` - Exit code on success or error message
fn execute_ssh_command(hostname: &str, username: &str, command: &str, common_suffix: &Option<String>, code_only: bool) -> Result<i32, String> {
fn execute_ssh_command(
hostname: &str,
username: &str,
command: &str,
common_suffix: &Option<String>,
code_only: bool,
) -> Result<i32, String> {
let display_name = shorten_hostname(hostname, common_suffix);
// Display execution start message with shortened hostname
println!("\n{} - STARTED", display_name.yellow().bold());
// Build the SSH command with appropriate options
let mut ssh_cmd = Command::new("ssh");
ssh_cmd.arg("-o").arg("StrictHostKeyChecking=no")
.arg("-o").arg("BatchMode=yes")
.arg(format!("{}@{}", username, hostname))
.arg(command)
.stdout(Stdio::piped())
.stderr(Stdio::piped());
ssh_cmd
.arg("-o")
.arg("StrictHostKeyChecking=no")
.arg("-o")
.arg("BatchMode=yes")
.arg(format!("{}@{}", username, hostname))
.arg(command)
.stdout(Stdio::piped())
.stderr(Stdio::piped());
// Execute the command
let mut child = match ssh_cmd.spawn() {
@ -302,21 +314,47 @@ fn execute_ssh_command(hostname: &str, username: &str, command: &str, common_suf
Err(e) => return Err(format!("Failed to start SSH process: {}", e)),
};
// Function to handle output lines with proper block management
let handle_output = |line: String, display_name: &str, code_only: bool| {
if !code_only {
let mut current_block = CURRENT_BLOCK.lock().unwrap();
// Check if we need to close the previous block and open a new one
match current_block.as_ref() {
Some(open_host) if open_host != display_name => {
// Close the previous block
println!("└ {} ┘", open_host.yellow());
// Open new block
println!("┌ {} ┐", display_name.yellow());
*current_block = Some(display_name.to_string());
}
None => {
// Open new block
println!("┌ {} ┐", display_name.yellow());
*current_block = Some(display_name.to_string());
}
Some(_) => {
// Same host, continue with current block
}
}
// Print the log line
println!("│ {} │ {}", display_name.yellow(), line);
}
};
// Capture and display stdout in real-time using a dedicated thread
let stdout = child.stdout.take().unwrap();
let display_name_stdout = display_name.clone();
let code_only_stdout = code_only;
let stdout_thread = thread::spawn(move || {
let reader = BufReader::new(stdout);
let prefix = format!("{}", "║".green());
for line in reader.lines() {
match line {
Ok(line) => {
if !code_only_stdout {
println!("{} {} {} {}", prefix, display_name_stdout.yellow(), prefix, line);
}
},
handle_output(line, &display_name_stdout, code_only_stdout);
}
Err(_) => break,
}
}
@ -328,15 +366,12 @@ fn execute_ssh_command(hostname: &str, username: &str, command: &str, common_suf
let code_only_stderr = code_only;
let stderr_thread = thread::spawn(move || {
let reader = BufReader::new(stderr);
let prefix = format!("{}", "║".red());
for line in reader.lines() {
match line {
Ok(line) => {
if !code_only_stderr {
println!("{} {} {} {}", prefix, display_name_stderr.yellow(), prefix, line);
}
},
handle_output(line, &display_name_stderr, code_only_stderr);
}
Err(_) => break,
}
}
@ -352,6 +387,17 @@ fn execute_ssh_command(hostname: &str, username: &str, command: &str, common_suf
stdout_thread.join().unwrap();
stderr_thread.join().unwrap();
// Close the block if this host was the last one to output
if !code_only {
let mut current_block = CURRENT_BLOCK.lock().unwrap();
if let Some(open_host) = current_block.as_ref() {
if open_host == &display_name {
println!("└ {} ┘", display_name.yellow());
*current_block = None;
}
}
}
// Format exit code with color (green for success, red for failure)
let exit_code = status.code().unwrap_or(-1);
let code_string = if exit_code == 0 {
@ -360,8 +406,10 @@ fn execute_ssh_command(hostname: &str, username: &str, command: &str, common_suf
format!("{}", exit_code.to_string().red())
};
// Display completion message
println!("{} - COMPLETED (Exit code: [{}])", display_name.yellow().bold(), code_string);
// For code-only mode, just show hostname and exit code
if code_only {
println!("{}: [{}]", display_name.yellow(), code_string);
}
Ok(exit_code)
}
@ -435,8 +483,9 @@ fn main() {
// Results are stored with original indices to maintain order
let resolved_ips_with_indices = Arc::new(Mutex::new(Vec::<(String, IpAddr, usize)>::new()));
host_with_indices.par_iter().for_each(|(host, idx)| {
match lookup_host(&host.name) {
host_with_indices
.par_iter()
.for_each(|(host, idx)| match lookup_host(&host.name) {
Ok(ips) if !ips.is_empty() => {
let ip = ips[0];
let mut results = resolved_ips_with_indices.lock().unwrap();
@ -444,14 +493,21 @@ fn main() {
}
Ok(_) => {
let mut results = resolved_ips_with_indices.lock().unwrap();
results.push((host.name.clone(), IpAddr::V4(std::net::Ipv4Addr::new(0, 0, 0, 0)), *idx));
results.push((
host.name.clone(),
IpAddr::V4(std::net::Ipv4Addr::new(0, 0, 0, 0)),
*idx,
));
}
Err(_) => {
let mut results = resolved_ips_with_indices.lock().unwrap();
results.push((host.name.clone(), IpAddr::V4(std::net::Ipv4Addr::new(0, 0, 0, 0)), *idx));
results.push((
host.name.clone(),
IpAddr::V4(std::net::Ipv4Addr::new(0, 0, 0, 0)),
*idx,
));
}
}
});
});
// Sort hosts by original index to maintain consistent display order
let mut resolved_hosts = resolved_ips_with_indices.lock().unwrap().clone();
@ -479,12 +535,18 @@ fn main() {
}
// Find common domain suffix to optimize display
let hostnames: Vec<String> = valid_hosts.iter().map(|(hostname, _, _)| hostname.clone()).collect();
let hostnames: Vec<String> = valid_hosts
.iter()
.map(|(hostname, _, _)| hostname.clone())
.collect();
let common_suffix = find_common_suffix(&hostnames);
// Inform user about display optimization if common suffix found
if let Some(suffix) = &common_suffix {
info!("Common domain suffix found: '{}' (will be displayed as '*')", suffix);
info!(
"Common domain suffix found: '{}' (will be displayed as '*')",
suffix
);
}
// Ask for confirmation before proceeding (unless --noconfirm is specified)
@ -526,7 +588,13 @@ fn main() {
// Execute SSH command in a separate thread
let handle = thread::spawn(move || {
match execute_ssh_command(&hostname, &username, &command, &common_suffix_clone, code_only) {
match execute_ssh_command(
&hostname,
&username,
&command,
&common_suffix_clone,
code_only,
) {
Ok(_) => (),
Err(e) => error!("Error executing command on {}: {}", hostname, e),
}