From 354408b656d298d572571395ab89fe3c54c036c7 Mon Sep 17 00:00:00 2001 From: Jian Qiu Date: Fri, 5 Jun 2026 01:13:15 +0800 Subject: [PATCH] fix: lbagent service code typo 20260604 (#24977) Co-authored-by: Qiu Jian --- pkg/lbagent/haproxy.go | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkg/lbagent/haproxy.go b/pkg/lbagent/haproxy.go index 013f843d65..e3e0f0de64 100644 --- a/pkg/lbagent/haproxy.go +++ b/pkg/lbagent/haproxy.go @@ -666,21 +666,11 @@ func (h *HaproxyHelper) runServiceOnce(args []string) error { args = args[1:] cmd := exec.Command(name, args...) - stdout, err := cmd.StdoutPipe() - if err != nil { - log.Errorf("service %s stdout pipe error: %s", cmd.String(), err) - return errors.Wrapf(err, "service %s stdout pipe error", cmd.String()) - } - stderr, err := cmd.StderrPipe() - if err != nil { - log.Errorf("service %s stderr pipe error: %s", cmd.String(), err) - return errors.Wrapf(err, "service %s stderr pipe error", cmd.String()) - } drain := func(out io.ReadCloser, isErr bool) { defer out.Close() buf := make([]byte, 1024) for { - n, err := stdout.Read(buf) + n, err := out.Read(buf) if err != nil { log.Errorf("read pipe error: %s", err) return @@ -692,6 +682,16 @@ func (h *HaproxyHelper) runServiceOnce(args []string) error { } } } + stdout, err := cmd.StdoutPipe() + if err != nil { + log.Errorf("service %s stdout pipe error: %s", cmd.String(), err) + return errors.Wrapf(err, "service %s stdout pipe error", cmd.String()) + } + stderr, err := cmd.StderrPipe() + if err != nil { + log.Errorf("service %s stderr pipe error: %s", cmd.String(), err) + return errors.Wrapf(err, "service %s stderr pipe error", cmd.String()) + } err = cmd.Start() if err != nil { return errors.Wrapf(err, "start service %s", cmd.String())