Skip to content

Commit aad8cd6

Browse files
committed
Cleanup
1 parent 7285372 commit aad8cd6

File tree

1 file changed

+3
-2
lines changed
  • controllers/nginx/pkg/cmd/controller

1 file changed

+3
-2
lines changed

controllers/nginx/pkg/cmd/controller/nginx.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ const (
5353

5454
defaultStatusModule statusModule = "default"
5555
vtsStatusModule statusModule = "vts"
56+
57+
errNoChild = "wait: no child processes"
5658
)
5759

5860
var (
@@ -326,7 +328,7 @@ func (n NGINXController) testTemplate(cfg []byte) error {
326328
return err
327329
}
328330
out, err := exec.Command(n.binary, "-t", "-c", tmpfile.Name()).CombinedOutput()
329-
if err != nil {
331+
if err != nil && err.Error() != errNoChild {
330332
// this error is different from the rest because it must be clear why nginx is not working
331333
oe := fmt.Sprintf(`
332334
-------------------------------------------------------------------------------
@@ -497,7 +499,6 @@ func (n *NGINXController) OnUpdate(ingressCfg ingress.Configuration) ([]byte, er
497499
})
498500
}
499501

500-
glog.Infof("%v", servers)
501502
n.proxy.ServerList = servers
502503

503504
return content, nil

0 commit comments

Comments
 (0)