From a4ee16cf1f3c13734a8c8bdadac82ca0f76256bb Mon Sep 17 00:00:00 2001
From: ssongliu <73214554+ssongliu@users.noreply.github.com>
Date: Fri, 19 Apr 2024 15:18:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=AE=B9=E5=99=A8?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=96=87=E4=BB=B6=E8=A2=AB=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E4=BD=86=E6=98=AF=E8=BF=9B=E7=A8=8B=E6=9C=AA=E7=BB=93=E6=9D=9F?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=20(#4588)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Refs #4582
---
 backend/app/service/container.go                | 2 +-
 frontend/src/components/compose-log/index.vue   | 7 ++++++-
 frontend/src/components/container-log/index.vue | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/backend/app/service/container.go b/backend/app/service/container.go
index b37ae98da..4fd22905e 100644
--- a/backend/app/service/container.go
+++ b/backend/app/service/container.go
@@ -701,7 +701,7 @@ func (u *ContainerService) ContainerLogs(wsConn *websocket.Conn, containerType,
 						return
 					}
 					global.LOG.Errorf("read bytes from log failed, err: %v", err)
-					continue
+					return
 				}
 				if !utf8.Valid(buffer[:n]) {
 					continue
diff --git a/frontend/src/components/compose-log/index.vue b/frontend/src/components/compose-log/index.vue
index 1862c1387..a46a3bdec 100644
--- a/frontend/src/components/compose-log/index.vue
+++ b/frontend/src/components/compose-log/index.vue
@@ -53,7 +53,7 @@
 <script lang="ts" setup>
 import i18n from '@/lang';
 import { dateFormatForName, downloadWithContent } from '@/utils/util';
-import { computed, reactive, ref, shallowRef, watch } from 'vue';
+import { computed, onBeforeUnmount, reactive, ref, shallowRef, watch } from 'vue';
 import { Codemirror } from 'vue-codemirror';
 import { javascript } from '@codemirror/lang-javascript';
 import { oneDark } from '@codemirror/theme-one-dark';
@@ -128,6 +128,7 @@ const searchLogs = async () => {
         MsgError(i18n.global.t('container.linesHelper'));
         return;
     }
+    terminalSocket.value?.send('close conn');
     terminalSocket.value?.close();
     logInfo.value = '';
     const href = window.location.href;
@@ -180,6 +181,10 @@ const acceptParams = (props: DialogProps): void => {
     }
 };
 
+onBeforeUnmount(() => {
+    handleClose();
+});
+
 defineExpose({
     acceptParams,
 });
diff --git a/frontend/src/components/container-log/index.vue b/frontend/src/components/container-log/index.vue
index c4e46294d..ec7f32603 100644
--- a/frontend/src/components/container-log/index.vue
+++ b/frontend/src/components/container-log/index.vue
@@ -102,6 +102,7 @@ const searchLogs = async () => {
         MsgError(i18n.global.t('container.linesHelper'));
         return;
     }
+    terminalSocket.value?.send('close conn');
     terminalSocket.value?.close();
     logInfo.value = '';
     const href = window.location.href;