github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 00:57:27 +00:00
Code Issues Projects Releases Wiki Activity

Do not log net.errClosing error when StreamWatcher is stopping.

Browse Source
This commit is contained in:
Alexandr Lurye 2015-04-04 01:39:43 +02:00 committed by Alexander Lourier
parent dbd7b186a0
commit 952ff24f0b
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/watch/iowatcher.go
View File

@ -76,6 +76,13 @@ func (sw *StreamWatcher) Stop() {
} }
} }
// stopping returns true if Stop() was called previously.
func (sw *StreamWatcher) stopping() bool {
sw.Lock()
defer sw.Unlock()
return sw.stopped
}
// receive reads result from the decoder in a loop and sends down the result channel. // receive reads result from the decoder in a loop and sends down the result channel.
func (sw *StreamWatcher) receive() { func (sw *StreamWatcher) receive() {
defer close(sw.result) defer close(sw.result)
@ -84,6 +91,10 @@ func (sw *StreamWatcher) receive() {
for { for {
action, obj, err := sw.source.Decode() action, obj, err := sw.source.Decode()
if err != nil { if err != nil {
// Ignore expected error.
if sw.stopping() {
return
}
switch err { switch err {
case io.EOF: case io.EOF:
// watch closed normally // watch closed normally