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.
This commit is contained in:
Allo
2023-02-06 20:15:49 +00:00
committed by Shelikhoo
parent 75ece5b6f6
commit 4f2fc729ce
+3 -3
View File
@@ -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
}