gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-01-31 22:18:07 +08:00
Code

fix: 解决系统别名导致无法修改开机自启的问题 (#2849)

Browse Source
This commit is contained in:
ssongliu 2023-11-08 16:19:29 +08:00 committed by GitHub
parent e8ee373fc4
commit ac97d3c05a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/app/service/ssh.go
View File

@ -109,6 +109,12 @@ func (u *SSHService) OperateSSH(operation string) error {
} }
stdout, err := cmd.Execf("%s systemctl %s %s", sudo, operation, serviceName) stdout, err := cmd.Execf("%s systemctl %s %s", sudo, operation, serviceName)
if err != nil { 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 fmt.Errorf("%s %s failed, stdout: %s, err: %v", operation, serviceName, stdout, err)
} }
return nil return nil

2
frontend/src/components/compose-log/index.vue
View File

@ -86,7 +86,7 @@ const logSearch = reactive({
}); });
const handleClose = () => { const handleClose = () => {
terminalSocket.value!.send('close conn'); terminalSocket.value?.send('close conn');
open.value = false; open.value = false;
}; };

2
frontend/src/components/container-log/index.vue
View File

@ -155,7 +155,7 @@ const onClean = async () => {
}; };
onBeforeUnmount(() => { onBeforeUnmount(() => {
terminalSocket.value!.send('close conn'); terminalSocket.value?.send('close conn');
}); });
defineExpose({ defineExpose({

2
frontend/src/views/container/container/log/index.vue
View File

@ -132,7 +132,7 @@ const loadTooltip = () => {
return i18n.global.t('commons.button.' + (screenfull.isFullscreen ? 'quitFullscreen' : 'fullscreen')); return i18n.global.t('commons.button.' + (screenfull.isFullscreen ? 'quitFullscreen' : 'fullscreen'));
}; };
const handleClose = async () => { const handleClose = async () => {
terminalSocket.value!.send('close conn'); terminalSocket.value?.send('close conn');
logVisible.value = false; logVisible.value = false;
}; };
watch(logVisible, (val) => { watch(logVisible, (val) => {