diff --git a/backend/app/service/ssh.go b/backend/app/service/ssh.go index 2b26aea26..421785a04 100644 --- a/backend/app/service/ssh.go +++ b/backend/app/service/ssh.go @@ -109,6 +109,12 @@ func (u *SSHService) OperateSSH(operation string) error { } stdout, err := cmd.Execf("%s systemctl %s %s", sudo, operation, serviceName) if err != nil { + if strings.Contains(stdout, "alias name or linked unit file") { + stdout, err := cmd.Execf("%s systemctl %s ssh", sudo, operation) + if err != nil { + return fmt.Errorf("%s ssh(alias name or linked unit file) failed, stdout: %s, err: %v", operation, stdout, err) + } + } return fmt.Errorf("%s %s failed, stdout: %s, err: %v", operation, serviceName, stdout, err) } return nil diff --git a/frontend/src/components/compose-log/index.vue b/frontend/src/components/compose-log/index.vue index f8a54509a..1862c1387 100644 --- a/frontend/src/components/compose-log/index.vue +++ b/frontend/src/components/compose-log/index.vue @@ -86,7 +86,7 @@ const logSearch = reactive({ }); const handleClose = () => { - terminalSocket.value!.send('close conn'); + terminalSocket.value?.send('close conn'); open.value = false; }; diff --git a/frontend/src/components/container-log/index.vue b/frontend/src/components/container-log/index.vue index 488ee99f9..ea62755c4 100644 --- a/frontend/src/components/container-log/index.vue +++ b/frontend/src/components/container-log/index.vue @@ -155,7 +155,7 @@ const onClean = async () => { }; onBeforeUnmount(() => { - terminalSocket.value!.send('close conn'); + terminalSocket.value?.send('close conn'); }); defineExpose({ diff --git a/frontend/src/views/container/container/log/index.vue b/frontend/src/views/container/container/log/index.vue index e4afb6bb8..b3b979ec0 100644 --- a/frontend/src/views/container/container/log/index.vue +++ b/frontend/src/views/container/container/log/index.vue @@ -132,7 +132,7 @@ const loadTooltip = () => { return i18n.global.t('commons.button.' + (screenfull.isFullscreen ? 'quitFullscreen' : 'fullscreen')); }; const handleClose = async () => { - terminalSocket.value!.send('close conn'); + terminalSocket.value?.send('close conn'); logVisible.value = false; }; watch(logVisible, (val) => {