summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2021-03-03 22:31:32 +0000
committergVisor bot <gvisor-bot@google.com>2021-03-03 22:31:32 +0000
commitbaa0ab982f66510088d66778cf063ff72e6f9022 (patch)
tree0a88d44238e394c99cf721ef71d7c8f03af09705
parente5e5788add22725e50f4c5934e5cac313359799b (diff)
parentcfd2c31962a4358d7d05a4bd04dde271dc238339 (diff)
Merge release-20210301.0-11-gcfd2c3196 (automated)
-rw-r--r--pkg/log/log.go3
1 files changed, 1 insertions, 2 deletions
diff --git a/pkg/log/log.go b/pkg/log/log.go
index d39af3bf4..073cf6238 100644
--- a/pkg/log/log.go
+++ b/pkg/log/log.go
@@ -40,7 +40,6 @@ import (
"sync/atomic"
"time"
- "golang.org/x/sys/unix"
"gvisor.dev/gvisor/pkg/linewriter"
"gvisor.dev/gvisor/pkg/sync"
)
@@ -105,7 +104,7 @@ func (l *Writer) Write(data []byte) (int, error) {
n += w
// Is it a non-blocking socket?
- if pathErr, ok := err.(*os.PathError); ok && pathErr.Err == unix.EAGAIN {
+ if pathErr, ok := err.(*os.PathError); ok && pathErr.Timeout() {
runtime.Gosched()
continue
}