From d5e41c1cb67b7ccb86fbbd80079642afd5055c2a Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Sat, 15 Feb 2014 21:10:37 -0800 Subject: [PATCH] Change name to listenbuffer Docker-DCO-1.1-Signed-off-by: Michael Crosby (github: crosbymichael) --- api/api.go | 4 ++-- .../activation.go => listenbuffer/buffer.go} | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename pkg/{socketactivation/activation.go => listenbuffer/buffer.go} (85%) diff --git a/api/api.go b/api/api.go index 8f6729ab61..8d7b1de685 100644 --- a/api/api.go +++ b/api/api.go @@ -10,7 +10,7 @@ import ( "fmt" "github.com/dotcloud/docker/auth" "github.com/dotcloud/docker/engine" - "github.com/dotcloud/docker/pkg/socketactivation" + "github.com/dotcloud/docker/pkg/listenbuffer" "github.com/dotcloud/docker/pkg/systemd" "github.com/dotcloud/docker/utils" "github.com/gorilla/mux" @@ -1163,7 +1163,7 @@ func ListenAndServe(proto, addr string, eng *engine.Engine, logging, enableCors } } - l, err := socketactivation.NewActivationListener(proto, addr, activationLock, 15*time.Minute) + l, err := listenbuffer.NewListenBuffer(proto, addr, activationLock, 15*time.Minute) if err != nil { return err } diff --git a/pkg/socketactivation/activation.go b/pkg/listenbuffer/buffer.go similarity index 85% rename from pkg/socketactivation/activation.go rename to pkg/listenbuffer/buffer.go index 0edbcaac23..c350805a7d 100644 --- a/pkg/socketactivation/activation.go +++ b/pkg/listenbuffer/buffer.go @@ -3,7 +3,7 @@ listening on a socket, unix, tcp, udp but hold connections until the application has booted and is ready to accept them */ -package socketactivation +package listenbuffer import ( "fmt" @@ -11,9 +11,9 @@ import ( "time" ) -// NewActivationListener returns a listener listening on addr with the protocol. It sets the +// NewListenBuffer returns a listener listening on addr with the protocol. It sets the // timeout to wait on first connection before an error is returned -func NewActivationListener(proto, addr string, activate chan struct{}, timeout time.Duration) (net.Listener, error) { +func NewListenBuffer(proto, addr string, activate chan struct{}, timeout time.Duration) (net.Listener, error) { wrapped, err := net.Listen(proto, addr) if err != nil { return nil, err