parent
81322b498e
commit
1db4ee8c61
|
@ -505,6 +505,7 @@ func (w *watchGrpcStream) serveWatchClient(wc pb.Watch_WatchClient) {
|
||||||
|
|
||||||
// serveStream forwards watch responses from run() to the subscriber
|
// serveStream forwards watch responses from run() to the subscriber
|
||||||
func (w *watchGrpcStream) serveStream(ws *watcherStream) {
|
func (w *watchGrpcStream) serveStream(ws *watcherStream) {
|
||||||
|
var closeErr error
|
||||||
emptyWr := &WatchResponse{}
|
emptyWr := &WatchResponse{}
|
||||||
wrs := []*WatchResponse{}
|
wrs := []*WatchResponse{}
|
||||||
resuming := false
|
resuming := false
|
||||||
|
@ -569,13 +570,14 @@ func (w *watchGrpcStream) serveStream(ws *watcherStream) {
|
||||||
}
|
}
|
||||||
case <-w.donec:
|
case <-w.donec:
|
||||||
closing = true
|
closing = true
|
||||||
|
closeErr = w.closeErr
|
||||||
case <-ws.initReq.ctx.Done():
|
case <-ws.initReq.ctx.Done():
|
||||||
closing = true
|
closing = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// try to send off close error
|
// try to send off close error
|
||||||
if w.closeErr != nil {
|
if closeErr != nil {
|
||||||
select {
|
select {
|
||||||
case ws.outc <- WatchResponse{closeErr: w.closeErr}:
|
case ws.outc <- WatchResponse{closeErr: w.closeErr}:
|
||||||
case <-w.donec:
|
case <-w.donec:
|
||||||
|
|
Loading…
Reference in New Issue