Prevent stdout / stderr race condition in limitedBuffer.

Signed-off-by: Stephen Drake <stephen@xenolith.net>
This commit is contained in:
Stephen Drake 2016-09-12 19:24:07 +02:00
parent 7e9c951813
commit 49dc97dbc2
1 changed files with 8 additions and 0 deletions

View File

@ -5,6 +5,7 @@ import (
"fmt"
"runtime"
"strings"
"sync"
"time"
"golang.org/x/net/context"
@ -271,11 +272,15 @@ func (d *Daemon) stopHealthchecks(c *container.Container) {
// Buffer up to maxOutputLen bytes. Further data is discarded.
type limitedBuffer struct {
buf bytes.Buffer
mu sync.Mutex
truncated bool // indicates that data has been lost
}
// Append to limitedBuffer while there is room.
func (b *limitedBuffer) Write(data []byte) (int, error) {
b.mu.Lock()
defer b.mu.Unlock()
bufLen := b.buf.Len()
dataLen := len(data)
keep := min(maxOutputLen-bufLen, dataLen)
@ -290,6 +295,9 @@ func (b *limitedBuffer) Write(data []byte) (int, error) {
// The contents of the buffer, with "..." appended if it overflowed.
func (b *limitedBuffer) String() string {
b.mu.Lock()
defer b.mu.Unlock()
out := b.buf.String()
if b.truncated {
out = out + "..."