|
|
@@ -21,7 +21,7 @@ mod tmux;
|
|
|
|
|
|
use crate::cli::{Cli, Commands};
|
|
|
use crate::config::{
|
|
|
- Cluster, Config, default_config_dir, resolve_cluster_for_recipe, select_cluster_by_name,
|
|
|
+ Cluster, Config, default_config_dir, load_recipe, resolve_cluster, select_cluster_by_name,
|
|
|
};
|
|
|
use crate::ssh::fetch_host_key;
|
|
|
|
|
|
@@ -97,16 +97,20 @@ async fn main() -> Result<()> {
|
|
|
}
|
|
|
Commands::Logs {
|
|
|
recipe: recipe_name,
|
|
|
+ cluster,
|
|
|
follow,
|
|
|
} => {
|
|
|
- let (cluster, _recipe) = resolve_cluster_for_recipe(&config, &recipe_name).await?;
|
|
|
+ let recipe = load_recipe(&recipe_name).await?;
|
|
|
+ let (cluster, _) = resolve_cluster(&config, &recipe, &cluster)?;
|
|
|
docker::show_logs(&config, &cluster, &recipe_name, follow, dry_run).await?;
|
|
|
}
|
|
|
Commands::Stop {
|
|
|
recipe: recipe_name,
|
|
|
+ cluster,
|
|
|
node,
|
|
|
} => {
|
|
|
- let (cluster, _recipe) = resolve_cluster_for_recipe(&config, &recipe_name).await?;
|
|
|
+ let recipe = load_recipe(&recipe_name).await?;
|
|
|
+ let (cluster, _) = resolve_cluster(&config, &recipe, &cluster)?;
|
|
|
docker::stop_cluster(&config, &cluster, &recipe_name, node.as_deref(), dry_run).await?;
|
|
|
}
|
|
|
Commands::Health {
|