ソースを参照

fix(app/log): prevent close of closed channel

The close of `done` channel may be called many times.
And the handler will be blocked when the log client exists and the
closure func is still not be called.
So use context to resolve those two problems.
Allo 2 年 前
コミット
4f2fc729ce
1 ファイル変更3 行追加3 行削除
  1. 3 3
      app/log/command/command.go

+ 3 - 3
app/log/command/command.go

@@ -43,18 +43,18 @@ func (s *LoggerServer) FollowLog(_ *FollowLogRequest, stream LoggerService_Follo
 	if !ok {
 		return newError("logger not support following")
 	}
-	done := make(chan struct{})
+	ctx, cancel := context.WithCancel(stream.Context())
 	f := func(msg cmlog.Message) {
 		err := stream.Send(&FollowLogResponse{
 			Message: msg.String(),
 		})
 		if err != nil {
-			close(done)
+			cancel()
 		}
 	}
 	follower.AddFollower(f)
 	defer follower.RemoveFollower(f)
-	<-done
+	<-ctx.Done()
 	return nil
 }