From acae61c8ad6f7d39f35ab25d91cbd2fa58ac62e1 Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Wed, 1 Apr 2015 17:25:56 -0700 Subject: [PATCH 1/2] Infer type Signed-off-by: Darren Shepherd Upstream-commit: 34f44c642faa94ae5d5677d49f690533c67cdf5e Component: engine --- components/engine/api/server/server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/api/server/server.go b/components/engine/api/server/server.go index c541c76248..fc2acc4c0c 100644 --- a/components/engine/api/server/server.go +++ b/components/engine/api/server/server.go @@ -32,7 +32,7 @@ import ( ) var ( - activationLock chan struct{} = make(chan struct{}) + activationLock = make(chan struct{}) ) type HttpServer struct { From 82a7741d140fec9a09217ec203abe103af9e6c18 Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Wed, 1 Apr 2015 17:26:22 -0700 Subject: [PATCH 2/2] Make server_windows.go consistent with server_linux.go Signed-off-by: Darren Shepherd Upstream-commit: 7433c9c92a9d2b53331f729249ddbbfa70cb76de Component: engine --- components/engine/api/server/server_windows.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/components/engine/api/server/server_windows.go b/components/engine/api/server/server_windows.go index e7feb55a21..ad7b3c48ad 100644 --- a/components/engine/api/server/server_windows.go +++ b/components/engine/api/server/server_windows.go @@ -39,10 +39,12 @@ func NewServer(proto, addr string, job *engine.Job) (Server, error) { } // Called through eng.Job("acceptconnections") -func AcceptConnections(job *engine.Job) engine.Status { +func AcceptConnections(job *engine.Job) error { // close the lock so the listeners start accepting connections - if activationLock != nil { + select { + case <-activationLock: + default: close(activationLock) } - return engine.StatusOK + return nil }