Browse Source

Merge pull request #31070 from cpuguy83/31060_fix_log_read_spin

Fix cpu spin waiting for log write events
Brian Goff 8 years ago
parent
commit
39851eac0c
1 changed files with 5 additions and 2 deletions
  1. 5 2
      daemon/logger/jsonfilelog/read.go

+ 5 - 2
daemon/logger/jsonfilelog/read.go

@@ -256,9 +256,12 @@ func followLogs(f *os.File, logWatcher *logger.LogWatcher, notifyRotate chan int
 
 	handleDecodeErr := func(err error) error {
 		if err == io.EOF {
-			for err := waitRead(); err != nil; {
+			for {
+				err := waitRead()
+				if err == nil {
+					break
+				}
 				if err == errRetry {
-					// retry the waitRead
 					continue
 				}
 				return err