fix upload log

zc2638 · Jan 17, 2024 · 7d279a7 · 7d279a7
1 parent 5660c1d
commit 7d279a7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/core/handler/client/handle.go b/core/handler/client/handle.go
@@ -503,22 +503,22 @@ func handleLogUpload() http.HandlerFunc {
 
 		ctx := r.Context()
 		ll := livelog.FromContext(ctx)
-		lineCount := ll.LineCount(ctx, stepID)
-		if lineCount == len(lines) {
-			ctr.Success(w)
-			return
-		}
 
 		var opts []any
 		if isAll {
+			lineCount := ll.LineCount(ctx, stepID)
+			if lineCount == len(lines) {
+				ctr.Success(w)
+				return
+			}
 			if err := ll.Reset(ctx, stepID); err != nil {
 				ctr.InternalError(w, err)
 				return
 			}
 			opts = []any{livelog.PublishOption(false)}
 		}
 		for _, line := range lines {
-			if err := ll.Write(ctx, stepID, line, opts); err != nil {
+			if err := ll.Write(ctx, stepID, line, opts...); err != nil {
 				ctr.InternalError(w, err)
 				return
 			}

diff --git a/pkg/livelog/writer.go b/pkg/livelog/writer.go
@@ -63,6 +63,13 @@ func (w *writer) Write(p []byte) (n int, err error) {
 }
 
 func (w *writer) Close() error {
+	select {
+	case _, ok := <-w.closeCh:
+		if !ok {
+			return nil
+		}
+	default:
+	}
 	w.closeCh <- struct{}{}
 
 	for {