From 671a4aa4a49b18306f68a5de72e32af345c12882 Mon Sep 17 00:00:00 2001
From: Brian Goff <cpuguy83@gmail.com>
Date: Thu, 16 Feb 2017 20:15:38 -0500
Subject: [PATCH] Merge pull request #31070 from
 cpuguy83/31060_fix_log_read_spin

Fix cpu spin waiting for log write events
(cherry picked from commit 39851eac0c655d0c1911db58d4f630e2da233cac)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 daemon/logger/jsonfilelog/read.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/daemon/logger/jsonfilelog/read.go b/daemon/logger/jsonfilelog/read.go
index deff86dfa3..30d533fc1f 100644
--- a/daemon/logger/jsonfilelog/read.go
+++ b/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