diff --git a/Cargo.lock b/Cargo.lock index c1357e4..dcf6f0f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -279,7 +279,7 @@ checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d" [[package]] name = "cm-dashboard" -version = "0.1.92" +version = "0.1.93" dependencies = [ "anyhow", "chrono", @@ -301,7 +301,7 @@ dependencies = [ [[package]] name = "cm-dashboard-agent" -version = "0.1.92" +version = "0.1.93" dependencies = [ "anyhow", "async-trait", @@ -324,7 +324,7 @@ dependencies = [ [[package]] name = "cm-dashboard-shared" -version = "0.1.92" +version = "0.1.93" dependencies = [ "chrono", "serde", diff --git a/agent/Cargo.toml b/agent/Cargo.toml index dae31f6..f9e8b8e 100644 --- a/agent/Cargo.toml +++ b/agent/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cm-dashboard-agent" -version = "0.1.93" +version = "0.1.94" edition = "2021" [dependencies] diff --git a/dashboard/Cargo.toml b/dashboard/Cargo.toml index 8bc4ab5..9547652 100644 --- a/dashboard/Cargo.toml +++ b/dashboard/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cm-dashboard" -version = "0.1.93" +version = "0.1.94" edition = "2021" [dependencies] diff --git a/dashboard/src/config/mod.rs b/dashboard/src/config/mod.rs index bf1eff9..85f0f1c 100644 --- a/dashboard/src/config/mod.rs +++ b/dashboard/src/config/mod.rs @@ -57,7 +57,6 @@ pub struct SshConfig { pub rebuild_user: String, pub rebuild_cmd: String, pub service_manage_cmd: String, - pub service_logs_cmd: String, } /// Service log file configuration per host diff --git a/dashboard/src/ui/mod.rs b/dashboard/src/ui/mod.rs index 59e9226..91000e1 100644 --- a/dashboard/src/ui/mod.rs +++ b/dashboard/src/ui/mod.rs @@ -311,14 +311,14 @@ impl TuiApp { } } KeyCode::Char('L') => { - // Show service logs via script in tmux split window + // Show service logs via service-manage script in tmux split window if let (Some(service_name), Some(hostname)) = (self.get_selected_service(), self.current_host.clone()) { let connection_ip = self.get_connection_ip(&hostname); let logs_command = format!( - "ssh -tt {}@{} '{} {}'", + "ssh -tt {}@{} '{} logs {}'", self.config.ssh.rebuild_user, connection_ip, - self.config.ssh.service_logs_cmd, + self.config.ssh.service_manage_cmd, service_name ); diff --git a/shared/Cargo.toml b/shared/Cargo.toml index f957905..95d2660 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cm-dashboard-shared" -version = "0.1.93" +version = "0.1.94" edition = "2021" [dependencies]