From a83d87abd442dda5f2d67a2701aae9c7b891e68a Mon Sep 17 00:00:00 2001
From: Robert Obryk <robryk@gmail.com>
Date: Tue, 2 Apr 2013 10:45:17 +0200
Subject: [PATCH] Renamed writeBroadcaster.Close() to CloseWriters().
---
container.go | 8 ++++----
utils.go | 2 +-
utils_test.go | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/container.go b/container.go
index d128ce98dd..7414e4c45b 100644
--- a/container.go
+++ b/container.go
@@ -161,14 +161,14 @@ func (container *Container) startPty() error {
// Copy the PTYs to our broadcasters
go func() {
- defer container.stdout.Close()
+ defer container.stdout.CloseWriters()
Debugf("[startPty] Begin of stdout pipe")
io.Copy(container.stdout, stdoutMaster)
Debugf("[startPty] End of stdout pipe")
}()
go func() {
- defer container.stderr.Close()
+ defer container.stderr.CloseWriters()
Debugf("[startPty] Begin of stderr pipe")
io.Copy(container.stderr, stderrMaster)
Debugf("[startPty] End of stderr pipe")
@@ -374,10 +374,10 @@ func (container *Container) monitor() {
if err := container.releaseNetwork(); err != nil {
log.Printf("%v: Failed to release network: %v", container.Id, err)
}
- if err := container.stdout.Close(); err != nil {
+ if err := container.stdout.CloseWriters(); err != nil {
Debugf("%s: Error close stdout: %s", container.Id, err)
}
- if err := container.stderr.Close(); err != nil {
+ if err := container.stderr.CloseWriters(); err != nil {
Debugf("%s: Error close stderr: %s", container.Id, err)
}
if err := container.Unmount(); err != nil {
diff --git a/utils.go b/utils.go
index f3a0134612..0f11f77b47 100644
--- a/utils.go
+++ b/utils.go
@@ -242,7 +242,7 @@ func (w *writeBroadcaster) Write(p []byte) (n int, err error) {
return len(p), nil
}
-func (w *writeBroadcaster) Close() error {
+func (w *writeBroadcaster) CloseWriters() error {
w.mu.Lock()
defer w.mu.Unlock()
for writer := range w.writers {
diff --git a/utils_test.go b/utils_test.go
index c32b7bc7f9..c70aedec79 100644
--- a/utils_test.go
+++ b/utils_test.go
@@ -122,7 +122,7 @@ func TestWriteBroadcaster(t *testing.T) {
t.Errorf("Buffer contains %v", bufferC.String())
}
- writer.Close()
+ writer.CloseWriters()
}
type devNullCloser int
--
GitLab