DevFW-CICD/ingress-nginx-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup

Browse source
This commit is contained in:
Manuel de Brito Fontes 2017-04-16 22:45:31 -03:00
parent 7285372c8f
commit aad8cd663c
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
controllers/nginx/pkg/cmd/controller/nginx.go
View file

@ -53,6 +53,8 @@ const (
defaultStatusModule statusModule = "default" defaultStatusModule statusModule = "default"
vtsStatusModule statusModule = "vts" vtsStatusModule statusModule = "vts"
errNoChild = "wait: no child processes"
) )
var ( var (
@ -326,7 +328,7 @@ func (n NGINXController) testTemplate(cfg []byte) error {
return err return err
} }
out, err := exec.Command(n.binary, "-t", "-c", tmpfile.Name()).CombinedOutput() 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 // this error is different from the rest because it must be clear why nginx is not working
oe := fmt.Sprintf(` oe := fmt.Sprintf(`
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
@ -497,7 +499,6 @@ func (n *NGINXController) OnUpdate(ingressCfg ingress.Configuration) ([]byte, er
}) })
} }
glog.Infof("%v", servers)
n.proxy.ServerList = servers n.proxy.ServerList = servers
return content, nil return content, nil