fix livelog writer close

zc2638 · Jan 17, 2024 · 5660c1d · 5660c1d
1 parent 37871b4
commit 5660c1d
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/pkg/livelog/writer.go b/pkg/livelog/writer.go
@@ -63,7 +63,18 @@ func (w *writer) Write(p []byte) (n int, err error) {
 }
 
 func (w *writer) Close() error {
-	close(w.closeCh)
+	w.closeCh <- struct{}{}
+
+	for {
+		select {
+		case line := <-w.lineCh:
+			w.lines = append(w.lines, line)
+			continue
+		default:
+		}
+		break
+	}
+
 	lineLen := len(w.lines)
 	if w.handler != nil && lineLen > 0 {
 		if lineLen > w.index {
@@ -78,6 +89,7 @@ func (w *writer) process() {
 	for {
 		select {
 		case <-w.closeCh:
+			close(w.closeCh)
 			return
 		case line := <-w.lineCh:
 			w.lines = append(w.lines, line)