From d22146f3b0505058bd519ea02a3637a65236a42d Mon Sep 17 00:00:00 2001 From: Guihua Zhu Date: Wed, 12 Dec 2018 09:08:02 +0800 Subject: [PATCH] handle_error_when_executing_diff Signed-off-by: Guihua Zhu --- internal/ingress/controller/nginx.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/internal/ingress/controller/nginx.go b/internal/ingress/controller/nginx.go index 2c04480f2..5528e2449 100644 --- a/internal/ingress/controller/nginx.go +++ b/internal/ingress/controller/nginx.go @@ -636,8 +636,10 @@ func (n *NGINXController) OnUpdate(ingressCfg ingress.Configuration) error { return err } - // TODO: executing diff can return exit code != 0 - diffOutput, _ := exec.Command("diff", "-u", cfgPath, tmpfile.Name()).CombinedOutput() + diffOutput, err := exec.Command("diff", "-u", cfgPath, tmpfile.Name()).CombinedOutput() + if err != nil { + klog.Warningf("Failed to executing diff command: %v", err) + } klog.Infof("NGINX configuration diff:\n%v", string(diffOutput))