From aad8cd663ca17250f2da837108bd7ef641b1919b Mon Sep 17 00:00:00 2001 From: Manuel de Brito Fontes Date: Sun, 16 Apr 2017 22:45:31 -0300 Subject: [PATCH] Cleanup --- controllers/nginx/pkg/cmd/controller/nginx.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/controllers/nginx/pkg/cmd/controller/nginx.go b/controllers/nginx/pkg/cmd/controller/nginx.go index afb2acdf8..e8f0391d7 100644 --- a/controllers/nginx/pkg/cmd/controller/nginx.go +++ b/controllers/nginx/pkg/cmd/controller/nginx.go @@ -53,6 +53,8 @@ const ( defaultStatusModule statusModule = "default" vtsStatusModule statusModule = "vts" + + errNoChild = "wait: no child processes" ) var ( @@ -326,7 +328,7 @@ func (n NGINXController) testTemplate(cfg []byte) error { return err } out, err := exec.Command(n.binary, "-t", "-c", tmpfile.Name()).CombinedOutput() - if err != nil { + if err != nil && err.Error() != errNoChild { // this error is different from the rest because it must be clear why nginx is not working oe := fmt.Sprintf(` ------------------------------------------------------------------------------- @@ -497,7 +499,6 @@ func (n *NGINXController) OnUpdate(ingressCfg ingress.Configuration) ([]byte, er }) } - glog.Infof("%v", servers) n.proxy.ServerList = servers return content, nil