From 7dcf535f27fc2a7e2d316ce001c8ba9930ae5ffe Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Mon, 17 Feb 2014 15:10:51 -0800 Subject: [PATCH] Move job register into servapi Docker-DCO-1.1-Signed-off-by: Michael Crosby (github: crosbymichael) Upstream-commit: e743021193e589b1358d0eef0521e9d8878dd66d Component: engine --- components/engine/api/api.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/components/engine/api/api.go b/components/engine/api/api.go index 8d7b1de685..bd4283e301 100644 --- a/components/engine/api/api.go +++ b/components/engine/api/api.go @@ -52,7 +52,6 @@ type HttpApiFunc func(eng *engine.Engine, version float64, w http.ResponseWriter func init() { engine.Register("serveapi", ServeApi) - engine.Register("acceptconnections", AcceptConnections) } func hijackServer(w http.ResponseWriter) (io.ReadCloser, io.Writer, error) { @@ -1211,6 +1210,10 @@ func ServeApi(job *engine.Job) engine.Status { ) activationLock = make(chan struct{}) + if err := job.Eng.Register("acceptconnections", AcceptConnections); err != nil { + return job.Error(err) + } + for _, protoAddr := range protoAddrs { protoAddrParts := strings.SplitN(protoAddr, "://", 2) go func() {