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

Auto stash before merge of "master" and "master/master"

Browse source 
Remove go-reap and use tini as process reaper
This commit is contained in:
Manuel de Brito Fontes 2017-05-16 16:06:33 -04:00
parent 8ca5fbeece
commit 22d63d0ad0
4 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -53,8 +53,6 @@ const (
defaultStatusModule statusModule = "default"
vtsStatusModule statusModule = "vts"
errNoChild = "wait: no child processes"
)
var (
@ -354,7 +352,7 @@ func (n NGINXController) testTemplate(cfg []byte) error {
return err
}
out, err := exec.Command(n.binary, "-t", "-c", tmpfile.Name()).CombinedOutput()
if err != nil && err.Error() != errNoChild {
if err != nil {
// this error is different from the rest because it must be clear why nginx is not working
oe := fmt.Sprintf(`
-------------------------------------------------------------------------------