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

Merge pull request #366 from caiyixiang/add_judgment

Browse source 
add_judgment
This commit is contained in:
Manuel Alejandro de Brito Fontes 2017-03-03 09:02:32 -03:00 committed by GitHub
commit d91a5ed592
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -200,7 +200,10 @@ func (n *NGINXController) backendDefaults() defaults.Backend {
if err != nil { if err != nil {
glog.Warningf("unexpected error merging defaults: %v", err) glog.Warningf("unexpected error merging defaults: %v", err)
} }
decoder.Decode(n.configmap.Data) err = decoder.Decode(n.configmap.Data)
if err != nil {
glog.Warningf("unexpected error decoding: %v", err)
}
return d.Backend return d.Backend
} }
@ -267,7 +270,10 @@ func (n NGINXController) testTemplate(cfg []byte) error {
return err return err
} }
defer tmpfile.Close() defer tmpfile.Close()
ioutil.WriteFile(tmpfile.Name(), cfg, 0644) err = ioutil.WriteFile(tmpfile.Name(), cfg, 0644)
if err != nil {
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 {
// 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