mirror of
https://github.com/house-of-vanity/rexec.git
synced 2025-07-07 00:54:06 +00:00
Format Rust code using rustfmt
This commit is contained in:
committed by
GitHub
parent
94fd8535ca
commit
7a324a04da
235
src/main.rs
235
src/main.rs
@ -66,12 +66,12 @@ struct Args {
|
|||||||
/// Maximum number of parallel SSH connections
|
/// Maximum number of parallel SSH connections
|
||||||
#[arg(short, long, default_value_t = 100)]
|
#[arg(short, long, default_value_t = 100)]
|
||||||
parallel: i32,
|
parallel: i32,
|
||||||
|
|
||||||
/// Use the embedded SSH client library instead of system SSH command
|
/// Use the embedded SSH client library instead of system SSH command
|
||||||
#[arg(
|
#[arg(
|
||||||
long,
|
long,
|
||||||
help = "Use embedded SSH client instead of system SSH. Does not support 'live output'.",
|
help = "Use embedded SSH client instead of system SSH. Does not support 'live output'.",
|
||||||
default_value_t = false,
|
default_value_t = false
|
||||||
)]
|
)]
|
||||||
embedded_ssh: bool,
|
embedded_ssh: bool,
|
||||||
}
|
}
|
||||||
@ -86,69 +86,69 @@ struct Host {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Find common domain suffix across all hostnames to simplify output display
|
/// Find common domain suffix across all hostnames to simplify output display
|
||||||
///
|
///
|
||||||
/// This function analyzes all hostnames to identify a common domain suffix
|
/// This function analyzes all hostnames to identify a common domain suffix
|
||||||
/// which can be shortened during display to improve readability.
|
/// which can be shortened during display to improve readability.
|
||||||
///
|
///
|
||||||
/// # Arguments
|
/// # Arguments
|
||||||
/// * `hostnames` - A slice of strings containing all server hostnames
|
/// * `hostnames` - A slice of strings containing all server hostnames
|
||||||
///
|
///
|
||||||
/// # Returns
|
/// # Returns
|
||||||
/// * `Option<String>` - The common suffix if found, or None
|
/// * `Option<String>` - The common suffix if found, or None
|
||||||
fn find_common_suffix(hostnames: &[String]) -> Option<String> {
|
fn find_common_suffix(hostnames: &[String]) -> Option<String> {
|
||||||
if hostnames.is_empty() {
|
if hostnames.is_empty() {
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Don't truncate if only one host
|
// Don't truncate if only one host
|
||||||
if hostnames.len() == 1 {
|
if hostnames.len() == 1 {
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
|
|
||||||
let first = &hostnames[0];
|
let first = &hostnames[0];
|
||||||
|
|
||||||
// Start with assumption that the entire first hostname is the common suffix
|
// Start with assumption that the entire first hostname is the common suffix
|
||||||
let mut common = first.clone();
|
let mut common = first.clone();
|
||||||
|
|
||||||
// Iterate through remaining hostnames, reducing the common part
|
// Iterate through remaining hostnames, reducing the common part
|
||||||
for hostname in hostnames.iter().skip(1) {
|
for hostname in hostnames.iter().skip(1) {
|
||||||
// Exit early if no common part remains
|
// Exit early if no common part remains
|
||||||
if common.is_empty() {
|
if common.is_empty() {
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Find common suffix with current hostname
|
// Find common suffix with current hostname
|
||||||
let mut new_common = String::new();
|
let mut new_common = String::new();
|
||||||
|
|
||||||
// Search for common suffix by comparing characters from right to left
|
// Search for common suffix by comparing characters from right to left
|
||||||
let mut common_chars = common.chars().rev();
|
let mut common_chars = common.chars().rev();
|
||||||
let mut hostname_chars = hostname.chars().rev();
|
let mut hostname_chars = hostname.chars().rev();
|
||||||
|
|
||||||
loop {
|
loop {
|
||||||
match (common_chars.next(), hostname_chars.next()) {
|
match (common_chars.next(), hostname_chars.next()) {
|
||||||
(Some(c1), Some(c2)) if c1 == c2 => new_common.insert(0, c1),
|
(Some(c1), Some(c2)) if c1 == c2 => new_common.insert(0, c1),
|
||||||
_ => break,
|
_ => break,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
common = new_common;
|
common = new_common;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Ensure the common part is a valid domain suffix (starts with a dot)
|
// Ensure the common part is a valid domain suffix (starts with a dot)
|
||||||
if common.is_empty() || !common.starts_with('.') {
|
if common.is_empty() || !common.starts_with('.') {
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Return the identified common suffix
|
// Return the identified common suffix
|
||||||
Some(common)
|
Some(common)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Shorten hostname by removing the common suffix and replacing with an asterisk
|
/// Shorten hostname by removing the common suffix and replacing with an asterisk
|
||||||
///
|
///
|
||||||
/// # Arguments
|
/// # Arguments
|
||||||
/// * `hostname` - The original hostname
|
/// * `hostname` - The original hostname
|
||||||
/// * `common_suffix` - Optional common suffix to remove
|
/// * `common_suffix` - Optional common suffix to remove
|
||||||
///
|
///
|
||||||
/// # Returns
|
/// # Returns
|
||||||
/// * `String` - Shortened hostname or original if no common suffix
|
/// * `String` - Shortened hostname or original if no common suffix
|
||||||
fn shorten_hostname(hostname: &str, common_suffix: &Option<String>) -> String {
|
fn shorten_hostname(hostname: &str, common_suffix: &Option<String>) -> String {
|
||||||
@ -156,13 +156,13 @@ fn shorten_hostname(hostname: &str, common_suffix: &Option<String>) -> String {
|
|||||||
Some(suffix) if hostname.ends_with(suffix) => {
|
Some(suffix) if hostname.ends_with(suffix) => {
|
||||||
let short_name = hostname[..hostname.len() - suffix.len()].to_string();
|
let short_name = hostname[..hostname.len() - suffix.len()].to_string();
|
||||||
format!("{}{}", short_name, "*")
|
format!("{}{}", short_name, "*")
|
||||||
},
|
}
|
||||||
_ => hostname.to_string(),
|
_ => hostname.to_string(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Read and parse the SSH known_hosts file to extract server names
|
/// Read and parse the SSH known_hosts file to extract server names
|
||||||
///
|
///
|
||||||
/// # Returns
|
/// # Returns
|
||||||
/// * `Vec<Host>` - List of hosts found in the known_hosts file
|
/// * `Vec<Host>` - List of hosts found in the known_hosts file
|
||||||
fn read_known_hosts() -> Vec<Host> {
|
fn read_known_hosts() -> Vec<Host> {
|
||||||
@ -184,11 +184,11 @@ fn read_known_hosts() -> Vec<Host> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Expand a numeric range in the format [start:end] to a list of strings
|
/// Expand a numeric range in the format [start:end] to a list of strings
|
||||||
///
|
///
|
||||||
/// # Arguments
|
/// # Arguments
|
||||||
/// * `start` - Starting number (inclusive)
|
/// * `start` - Starting number (inclusive)
|
||||||
/// * `end` - Ending number (inclusive)
|
/// * `end` - Ending number (inclusive)
|
||||||
///
|
///
|
||||||
/// # Returns
|
/// # Returns
|
||||||
/// * `Vec<String>` - List of numbers as strings
|
/// * `Vec<String>` - List of numbers as strings
|
||||||
fn expand_range(start: i32, end: i32) -> Vec<String> {
|
fn expand_range(start: i32, end: i32) -> Vec<String> {
|
||||||
@ -196,10 +196,10 @@ fn expand_range(start: i32, end: i32) -> Vec<String> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Expand a comma-separated list in the format {item1,item2,item3} to a list of strings
|
/// Expand a comma-separated list in the format {item1,item2,item3} to a list of strings
|
||||||
///
|
///
|
||||||
/// # Arguments
|
/// # Arguments
|
||||||
/// * `list` - Comma-separated string to expand
|
/// * `list` - Comma-separated string to expand
|
||||||
///
|
///
|
||||||
/// # Returns
|
/// # Returns
|
||||||
/// * `Vec<String>` - List of expanded items
|
/// * `Vec<String>` - List of expanded items
|
||||||
fn expand_list(list: &str) -> Vec<String> {
|
fn expand_list(list: &str) -> Vec<String> {
|
||||||
@ -207,14 +207,14 @@ fn expand_list(list: &str) -> Vec<String> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Expand a server pattern string with range and list notation into individual hostnames
|
/// Expand a server pattern string with range and list notation into individual hostnames
|
||||||
///
|
///
|
||||||
/// Supports two expansion types:
|
/// Supports two expansion types:
|
||||||
/// - Range expansion: server-[1:5] → server-1, server-2, server-3, server-4, server-5
|
/// - Range expansion: server-[1:5] → server-1, server-2, server-3, server-4, server-5
|
||||||
/// - List expansion: server-{prod,dev} → server-prod, server-dev
|
/// - List expansion: server-{prod,dev} → server-prod, server-dev
|
||||||
///
|
///
|
||||||
/// # Arguments
|
/// # Arguments
|
||||||
/// * `s` - Pattern string to expand
|
/// * `s` - Pattern string to expand
|
||||||
///
|
///
|
||||||
/// # Returns
|
/// # Returns
|
||||||
/// * `Vec<Host>` - List of expanded Host objects
|
/// * `Vec<Host>` - List of expanded Host objects
|
||||||
fn expand_string(s: &str) -> Vec<Host> {
|
fn expand_string(s: &str) -> Vec<Host> {
|
||||||
@ -278,79 +278,99 @@ fn expand_string(s: &str) -> Vec<Host> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Execute a command on a single host using the system SSH client
|
/// Execute a command on a single host using the system SSH client
|
||||||
///
|
///
|
||||||
/// This function runs an SSH command using the system's SSH client,
|
/// This function runs an SSH command using the system's SSH client,
|
||||||
/// capturing and displaying output in real-time with proper formatting.
|
/// capturing and displaying output in real-time with proper formatting.
|
||||||
///
|
///
|
||||||
/// # Arguments
|
/// # Arguments
|
||||||
/// * `hostname` - Target server hostname
|
/// * `hostname` - Target server hostname
|
||||||
/// * `username` - SSH username
|
/// * `username` - SSH username
|
||||||
/// * `command` - Command to execute
|
/// * `command` - Command to execute
|
||||||
/// * `common_suffix` - Optional common suffix for hostname display formatting
|
/// * `common_suffix` - Optional common suffix for hostname display formatting
|
||||||
///
|
///
|
||||||
/// # Returns
|
/// # Returns
|
||||||
/// * `Result<i32, String>` - Exit code on success or error message
|
/// * `Result<i32, String>` - Exit code on success or error message
|
||||||
fn execute_ssh_command(hostname: &str, username: &str, command: &str, common_suffix: &Option<String>) -> Result<i32, String> {
|
fn execute_ssh_command(
|
||||||
|
hostname: &str,
|
||||||
|
username: &str,
|
||||||
|
command: &str,
|
||||||
|
common_suffix: &Option<String>,
|
||||||
|
) -> Result<i32, String> {
|
||||||
let display_name = shorten_hostname(hostname, common_suffix);
|
let display_name = shorten_hostname(hostname, common_suffix);
|
||||||
|
|
||||||
// Display execution start message with shortened hostname
|
// Display execution start message with shortened hostname
|
||||||
println!("\n{} - STARTED", display_name.yellow().bold());
|
println!("\n{} - STARTED", display_name.yellow().bold());
|
||||||
|
|
||||||
// Build the SSH command with appropriate options
|
// Build the SSH command with appropriate options
|
||||||
let mut ssh_cmd = Command::new("ssh");
|
let mut ssh_cmd = Command::new("ssh");
|
||||||
ssh_cmd.arg("-o").arg("StrictHostKeyChecking=no")
|
ssh_cmd
|
||||||
.arg("-o").arg("BatchMode=yes")
|
.arg("-o")
|
||||||
.arg(format!("{}@{}", username, hostname))
|
.arg("StrictHostKeyChecking=no")
|
||||||
.arg(command)
|
.arg("-o")
|
||||||
.stdout(Stdio::piped())
|
.arg("BatchMode=yes")
|
||||||
.stderr(Stdio::piped());
|
.arg(format!("{}@{}", username, hostname))
|
||||||
|
.arg(command)
|
||||||
|
.stdout(Stdio::piped())
|
||||||
|
.stderr(Stdio::piped());
|
||||||
|
|
||||||
// Execute the command
|
// Execute the command
|
||||||
let mut child = match ssh_cmd.spawn() {
|
let mut child = match ssh_cmd.spawn() {
|
||||||
Ok(child) => child,
|
Ok(child) => child,
|
||||||
Err(e) => return Err(format!("Failed to start SSH process: {}", e)),
|
Err(e) => return Err(format!("Failed to start SSH process: {}", e)),
|
||||||
};
|
};
|
||||||
|
|
||||||
// Capture and display stdout in real-time using a dedicated thread
|
// Capture and display stdout in real-time using a dedicated thread
|
||||||
let stdout = child.stdout.take().unwrap();
|
let stdout = child.stdout.take().unwrap();
|
||||||
let display_name_stdout = display_name.clone();
|
let display_name_stdout = display_name.clone();
|
||||||
let stdout_thread = thread::spawn(move || {
|
let stdout_thread = thread::spawn(move || {
|
||||||
let reader = BufReader::new(stdout);
|
let reader = BufReader::new(stdout);
|
||||||
let prefix = format!("{}", "║".green());
|
let prefix = format!("{}", "║".green());
|
||||||
|
|
||||||
for line in reader.lines() {
|
for line in reader.lines() {
|
||||||
match line {
|
match line {
|
||||||
Ok(line) => println!("{} {} {} {}", prefix, display_name_stdout.yellow(), prefix, line),
|
Ok(line) => println!(
|
||||||
|
"{} {} {} {}",
|
||||||
|
prefix,
|
||||||
|
display_name_stdout.yellow(),
|
||||||
|
prefix,
|
||||||
|
line
|
||||||
|
),
|
||||||
Err(_) => break,
|
Err(_) => break,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// Capture and display stderr in real-time using a dedicated thread
|
// Capture and display stderr in real-time using a dedicated thread
|
||||||
let stderr = child.stderr.take().unwrap();
|
let stderr = child.stderr.take().unwrap();
|
||||||
let display_name_stderr = display_name.clone();
|
let display_name_stderr = display_name.clone();
|
||||||
let stderr_thread = thread::spawn(move || {
|
let stderr_thread = thread::spawn(move || {
|
||||||
let reader = BufReader::new(stderr);
|
let reader = BufReader::new(stderr);
|
||||||
let prefix = format!("{}", "║".red());
|
let prefix = format!("{}", "║".red());
|
||||||
|
|
||||||
for line in reader.lines() {
|
for line in reader.lines() {
|
||||||
match line {
|
match line {
|
||||||
Ok(line) => println!("{} {} {} {}", prefix, display_name_stderr.yellow(), prefix, line),
|
Ok(line) => println!(
|
||||||
|
"{} {} {} {}",
|
||||||
|
prefix,
|
||||||
|
display_name_stderr.yellow(),
|
||||||
|
prefix,
|
||||||
|
line
|
||||||
|
),
|
||||||
Err(_) => break,
|
Err(_) => break,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// Wait for command to complete
|
// Wait for command to complete
|
||||||
let status = match child.wait() {
|
let status = match child.wait() {
|
||||||
Ok(status) => status,
|
Ok(status) => status,
|
||||||
Err(e) => return Err(format!("Failed to wait for SSH process: {}", e)),
|
Err(e) => return Err(format!("Failed to wait for SSH process: {}", e)),
|
||||||
};
|
};
|
||||||
|
|
||||||
// Wait for stdout and stderr threads to complete
|
// Wait for stdout and stderr threads to complete
|
||||||
stdout_thread.join().unwrap();
|
stdout_thread.join().unwrap();
|
||||||
stderr_thread.join().unwrap();
|
stderr_thread.join().unwrap();
|
||||||
|
|
||||||
// Format exit code with color (green for success, red for failure)
|
// Format exit code with color (green for success, red for failure)
|
||||||
let exit_code = status.code().unwrap_or(-1);
|
let exit_code = status.code().unwrap_or(-1);
|
||||||
let code_string = if exit_code == 0 {
|
let code_string = if exit_code == 0 {
|
||||||
@ -358,18 +378,22 @@ fn execute_ssh_command(hostname: &str, username: &str, command: &str, common_suf
|
|||||||
} else {
|
} else {
|
||||||
format!("{}", exit_code.to_string().red())
|
format!("{}", exit_code.to_string().red())
|
||||||
};
|
};
|
||||||
|
|
||||||
// Display completion message
|
// Display completion message
|
||||||
println!("{} - COMPLETED (Exit code: [{}])", display_name.yellow().bold(), code_string);
|
println!(
|
||||||
|
"{} - COMPLETED (Exit code: [{}])",
|
||||||
|
display_name.yellow().bold(),
|
||||||
|
code_string
|
||||||
|
);
|
||||||
|
|
||||||
Ok(exit_code)
|
Ok(exit_code)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Execute commands on multiple hosts using the massh library (embedded SSH)
|
/// Execute commands on multiple hosts using the massh library (embedded SSH)
|
||||||
///
|
///
|
||||||
/// This function handles batch processing of hosts to maintain the original order
|
/// This function handles batch processing of hosts to maintain the original order
|
||||||
/// while executing commands in parallel using the massh library.
|
/// while executing commands in parallel using the massh library.
|
||||||
///
|
///
|
||||||
/// # Arguments
|
/// # Arguments
|
||||||
/// * `hosts` - Vector of (hostname, IP address, original index) tuples
|
/// * `hosts` - Vector of (hostname, IP address, original index) tuples
|
||||||
/// * `username` - SSH username
|
/// * `username` - SSH username
|
||||||
@ -377,7 +401,14 @@ fn execute_ssh_command(hostname: &str, username: &str, command: &str, common_suf
|
|||||||
/// * `parallel` - Maximum number of parallel connections
|
/// * `parallel` - Maximum number of parallel connections
|
||||||
/// * `code_only` - Whether to display only exit codes
|
/// * `code_only` - Whether to display only exit codes
|
||||||
/// * `common_suffix` - Optional common suffix for hostname display formatting
|
/// * `common_suffix` - Optional common suffix for hostname display formatting
|
||||||
fn execute_with_massh(hosts: &[(String, IpAddr, usize)], username: &str, command: &str, parallel: i32, code_only: bool, common_suffix: &Option<String>) {
|
fn execute_with_massh(
|
||||||
|
hosts: &[(String, IpAddr, usize)],
|
||||||
|
username: &str,
|
||||||
|
command: &str,
|
||||||
|
parallel: i32,
|
||||||
|
code_only: bool,
|
||||||
|
common_suffix: &Option<String>,
|
||||||
|
) {
|
||||||
// Create a lookup table for host data using IP addresses as keys
|
// Create a lookup table for host data using IP addresses as keys
|
||||||
let mut hosts_and_ips: HashMap<IpAddr, (String, usize)> = HashMap::new();
|
let mut hosts_and_ips: HashMap<IpAddr, (String, usize)> = HashMap::new();
|
||||||
let mut massh_hosts: Vec<MasshHostConfig> = Vec::new();
|
let mut massh_hosts: Vec<MasshHostConfig> = Vec::new();
|
||||||
@ -398,7 +429,7 @@ fn execute_with_massh(hosts: &[(String, IpAddr, usize)], username: &str, command
|
|||||||
|
|
||||||
while processed < massh_hosts.len() {
|
while processed < massh_hosts.len() {
|
||||||
let end = std::cmp::min(processed + batch_size, massh_hosts.len());
|
let end = std::cmp::min(processed + batch_size, massh_hosts.len());
|
||||||
|
|
||||||
// Create a new config and vector for this batch
|
// Create a new config and vector for this batch
|
||||||
let mut batch_hosts = Vec::new();
|
let mut batch_hosts = Vec::new();
|
||||||
for host in &massh_hosts[processed..end] {
|
for host in &massh_hosts[processed..end] {
|
||||||
@ -409,7 +440,7 @@ fn execute_with_massh(hosts: &[(String, IpAddr, usize)], username: &str, command
|
|||||||
user: None,
|
user: None,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create a new MasshClient for this batch with appropriate configuration
|
// Create a new MasshClient for this batch with appropriate configuration
|
||||||
let batch_config = MasshConfig {
|
let batch_config = MasshConfig {
|
||||||
default_auth: SshAuth::Agent,
|
default_auth: SshAuth::Agent,
|
||||||
@ -419,15 +450,15 @@ fn execute_with_massh(hosts: &[(String, IpAddr, usize)], username: &str, command
|
|||||||
timeout: 0,
|
timeout: 0,
|
||||||
hosts: batch_hosts,
|
hosts: batch_hosts,
|
||||||
};
|
};
|
||||||
|
|
||||||
let batch_massh = MasshClient::from(&batch_config);
|
let batch_massh = MasshClient::from(&batch_config);
|
||||||
|
|
||||||
// Execute the command on all hosts in this batch
|
// Execute the command on all hosts in this batch
|
||||||
let rx = batch_massh.execute(command.to_string());
|
let rx = batch_massh.execute(command.to_string());
|
||||||
|
|
||||||
// Collect all results from this batch before moving to the next
|
// Collect all results from this batch before moving to the next
|
||||||
let mut batch_results = Vec::new();
|
let mut batch_results = Vec::new();
|
||||||
|
|
||||||
while let Ok((host, result)) = rx.recv() {
|
while let Ok((host, result)) = rx.recv() {
|
||||||
// Extract IP address from the massh result
|
// Extract IP address from the massh result
|
||||||
let ip: String = host.split('@').collect::<Vec<_>>()[1]
|
let ip: String = host.split('@').collect::<Vec<_>>()[1]
|
||||||
@ -435,7 +466,7 @@ fn execute_with_massh(hosts: &[(String, IpAddr, usize)], username: &str, command
|
|||||||
.collect::<Vec<_>>()[0]
|
.collect::<Vec<_>>()[0]
|
||||||
.to_string();
|
.to_string();
|
||||||
let ip = ip.parse::<IpAddr>().unwrap();
|
let ip = ip.parse::<IpAddr>().unwrap();
|
||||||
|
|
||||||
// Lookup the original hostname and index
|
// Lookup the original hostname and index
|
||||||
if let Some((hostname, idx)) = hosts_and_ips.get(&ip) {
|
if let Some((hostname, idx)) = hosts_and_ips.get(&ip) {
|
||||||
batch_results.push((hostname.clone(), ip, result, *idx));
|
batch_results.push((hostname.clone(), ip, result, *idx));
|
||||||
@ -443,17 +474,17 @@ fn execute_with_massh(hosts: &[(String, IpAddr, usize)], username: &str, command
|
|||||||
error!("Unexpected IP address in result: {}", ip);
|
error!("Unexpected IP address in result: {}", ip);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Sort results by original index to maintain consistent display order
|
// Sort results by original index to maintain consistent display order
|
||||||
batch_results.sort_by_key(|(_, _, _, idx)| *idx);
|
batch_results.sort_by_key(|(_, _, _, idx)| *idx);
|
||||||
|
|
||||||
// Display results for each host in the batch
|
// Display results for each host in the batch
|
||||||
for (hostname, _ip, result, _) in batch_results {
|
for (hostname, _ip, result, _) in batch_results {
|
||||||
let display_name = shorten_hostname(&hostname, common_suffix);
|
let display_name = shorten_hostname(&hostname, common_suffix);
|
||||||
|
|
||||||
// Display hostname with consistent formatting
|
// Display hostname with consistent formatting
|
||||||
println!("\n{}", display_name.yellow().bold().to_string());
|
println!("\n{}", display_name.yellow().bold().to_string());
|
||||||
|
|
||||||
// Handle execution result
|
// Handle execution result
|
||||||
let output = match result {
|
let output = match result {
|
||||||
Ok(output) => output,
|
Ok(output) => output,
|
||||||
@ -462,14 +493,14 @@ fn execute_with_massh(hosts: &[(String, IpAddr, usize)], username: &str, command
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// Format exit code with color
|
// Format exit code with color
|
||||||
let code_string = if output.exit_status == 0 {
|
let code_string = if output.exit_status == 0 {
|
||||||
format!("{}", output.exit_status.to_string().green())
|
format!("{}", output.exit_status.to_string().green())
|
||||||
} else {
|
} else {
|
||||||
format!("{}", output.exit_status.to_string().red())
|
format!("{}", output.exit_status.to_string().red())
|
||||||
};
|
};
|
||||||
|
|
||||||
// Display summary of command execution
|
// Display summary of command execution
|
||||||
println!(
|
println!(
|
||||||
"{}",
|
"{}",
|
||||||
@ -515,7 +546,7 @@ fn execute_with_massh(hosts: &[(String, IpAddr, usize)], username: &str, command
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
processed = end;
|
processed = end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -527,7 +558,7 @@ fn main() {
|
|||||||
.format_timestamp(None)
|
.format_timestamp(None)
|
||||||
.format_target(false)
|
.format_target(false)
|
||||||
.init();
|
.init();
|
||||||
|
|
||||||
// Parse command-line arguments
|
// Parse command-line arguments
|
||||||
let args = Args::parse();
|
let args = Args::parse();
|
||||||
|
|
||||||
@ -584,13 +615,14 @@ fn main() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
info!("Matched hosts:");
|
info!("Matched hosts:");
|
||||||
|
|
||||||
// Perform DNS resolution for all hosts in parallel
|
// Perform DNS resolution for all hosts in parallel
|
||||||
// Results are stored with original indices to maintain order
|
// Results are stored with original indices to maintain order
|
||||||
let resolved_ips_with_indices = Arc::new(Mutex::new(Vec::<(String, IpAddr, usize)>::new()));
|
let resolved_ips_with_indices = Arc::new(Mutex::new(Vec::<(String, IpAddr, usize)>::new()));
|
||||||
|
|
||||||
host_with_indices.par_iter().for_each(|(host, idx)| {
|
host_with_indices
|
||||||
match lookup_host(&host.name) {
|
.par_iter()
|
||||||
|
.for_each(|(host, idx)| match lookup_host(&host.name) {
|
||||||
Ok(ips) if !ips.is_empty() => {
|
Ok(ips) if !ips.is_empty() => {
|
||||||
let ip = ips[0];
|
let ip = ips[0];
|
||||||
let mut results = resolved_ips_with_indices.lock().unwrap();
|
let mut results = resolved_ips_with_indices.lock().unwrap();
|
||||||
@ -598,19 +630,26 @@ fn main() {
|
|||||||
}
|
}
|
||||||
Ok(_) => {
|
Ok(_) => {
|
||||||
let mut results = resolved_ips_with_indices.lock().unwrap();
|
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(_) => {
|
Err(_) => {
|
||||||
let mut results = resolved_ips_with_indices.lock().unwrap();
|
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
|
// Sort hosts by original index to maintain consistent display order
|
||||||
let mut resolved_hosts = resolved_ips_with_indices.lock().unwrap().clone();
|
let mut resolved_hosts = resolved_ips_with_indices.lock().unwrap().clone();
|
||||||
resolved_hosts.sort_by_key(|(_, _, idx)| *idx);
|
resolved_hosts.sort_by_key(|(_, _, idx)| *idx);
|
||||||
|
|
||||||
// Display all matched hosts with their resolved IPs
|
// Display all matched hosts with their resolved IPs
|
||||||
for (hostname, ip, _) in &resolved_hosts {
|
for (hostname, ip, _) in &resolved_hosts {
|
||||||
if ip.is_unspecified() {
|
if ip.is_unspecified() {
|
||||||
@ -631,16 +670,22 @@ fn main() {
|
|||||||
error!("No valid hosts to connect to");
|
error!("No valid hosts to connect to");
|
||||||
process::exit(1);
|
process::exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Find common domain suffix to optimize display
|
// 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);
|
let common_suffix = find_common_suffix(&hostnames);
|
||||||
|
|
||||||
// Inform user about display optimization if common suffix found
|
// Inform user about display optimization if common suffix found
|
||||||
if let Some(suffix) = &common_suffix {
|
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)
|
// Ask for confirmation before proceeding (unless --noconfirm is specified)
|
||||||
if !args.noconfirm
|
if !args.noconfirm
|
||||||
&& match Question::new(&*format!(
|
&& match Question::new(&*format!(
|
||||||
@ -665,40 +710,48 @@ fn main() {
|
|||||||
// Use system SSH client (default behavior)
|
// Use system SSH client (default behavior)
|
||||||
let batch_size = args.parallel as usize;
|
let batch_size = args.parallel as usize;
|
||||||
let mut processed = 0;
|
let mut processed = 0;
|
||||||
|
|
||||||
while processed < valid_hosts.len() {
|
while processed < valid_hosts.len() {
|
||||||
let end = std::cmp::min(processed + batch_size, valid_hosts.len());
|
let end = std::cmp::min(processed + batch_size, valid_hosts.len());
|
||||||
let batch = &valid_hosts[processed..end];
|
let batch = &valid_hosts[processed..end];
|
||||||
|
|
||||||
// Create a thread for each host in the current batch
|
// Create a thread for each host in the current batch
|
||||||
let mut handles = Vec::new();
|
let mut handles = Vec::new();
|
||||||
|
|
||||||
for (hostname, _, _) in batch {
|
for (hostname, _, _) in batch {
|
||||||
let hostname = hostname.clone();
|
let hostname = hostname.clone();
|
||||||
let username = args.username.clone();
|
let username = args.username.clone();
|
||||||
let command = args.command.clone();
|
let command = args.command.clone();
|
||||||
let common_suffix_clone = common_suffix.clone();
|
let common_suffix_clone = common_suffix.clone();
|
||||||
|
|
||||||
// Execute SSH command in a separate thread
|
// Execute SSH command in a separate thread
|
||||||
let handle = thread::spawn(move || {
|
let handle = thread::spawn(move || {
|
||||||
match execute_ssh_command(&hostname, &username, &command, &common_suffix_clone) {
|
match execute_ssh_command(&hostname, &username, &command, &common_suffix_clone)
|
||||||
|
{
|
||||||
Ok(_) => (),
|
Ok(_) => (),
|
||||||
Err(e) => error!("Error executing command on {}: {}", hostname, e),
|
Err(e) => error!("Error executing command on {}: {}", hostname, e),
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
handles.push(handle);
|
handles.push(handle);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Wait for all threads in this batch to complete
|
// Wait for all threads in this batch to complete
|
||||||
for handle in handles {
|
for handle in handles {
|
||||||
handle.join().unwrap();
|
handle.join().unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
processed = end;
|
processed = end;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// Use the embedded massh library implementation
|
// Use the embedded massh library implementation
|
||||||
execute_with_massh(&valid_hosts, &args.username, &args.command, args.parallel, args.code, &common_suffix);
|
execute_with_massh(
|
||||||
|
&valid_hosts,
|
||||||
|
&args.username,
|
||||||
|
&args.command,
|
||||||
|
args.parallel,
|
||||||
|
args.code,
|
||||||
|
&common_suffix,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user