Merge pull request #12010 from ibuildthecloud/small

Small changes from #11967 for review comments
Upstream-commit: e64f6baf116771b22a3050cf686624dbb6b19f37
Component: engine

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 {

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
 }