From d9bb31a523981d8ed3687bc9c34495af8fe716ae Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Thu, 29 May 2025 15:35:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=91=BD=E4=BB=A4?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=87=BD=E6=95=B0=E7=9A=84=E8=B6=85=E6=97=B6?= =?UTF-8?q?=E5=A4=84=E7=90=86=E5=92=8C=E8=BE=93=E5=87=BA=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/framework/cmd/cmd.go | 7 +------ src/modules/network_element/service/ne_version.go | 4 ++-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/framework/cmd/cmd.go b/src/framework/cmd/cmd.go index 04d3e6e0..e22ffe08 100644 --- a/src/framework/cmd/cmd.go +++ b/src/framework/cmd/cmd.go @@ -8,18 +8,13 @@ import ( "time" ) -// Exec 本地执行命令,默认超时20s 列如：("ls -ls") +// Exec 本地执行命令 列如：("ls -ls") func Exec(cmdStr string) (string, error) { - ctx, cancel := context.WithTimeout(context.Background(), 20*time.Second) - defer cancel() cmd := exec.Command("bash", "-c", cmdStr) var stdout, stderr bytes.Buffer cmd.Stdout = &stdout cmd.Stderr = &stderr err := cmd.Run() - if ctx.Err() == context.DeadlineExceeded { - return "", fmt.Errorf("errCmdTimeout %v", err) - } if err != nil { errMsg := "" if len(stderr.String()) != 0 { diff --git a/src/modules/network_element/service/ne_version.go b/src/modules/network_element/service/ne_version.go index dec302c2..84042fb9 100644 --- a/src/modules/network_element/service/ne_version.go +++ b/src/modules/network_element/service/ne_version.go @@ -266,8 +266,8 @@ func (r NeVersion) operateCommand(action, neType string, neFilePaths []string) ( omcStrArr = append(omcStrArr, fmt.Sprintf("sudo rm %s", strings.Join(neFilePaths, " "))) // 2s后执行omc相关命令 - cmdStrArr = append(cmdStrArr, fmt.Sprintf("sudo rm -f /tmp/omc_%s.out \n", action)) - cmdStrArr = append(cmdStrArr, fmt.Sprintf("nohup sh -c \"sleep 2s && %s\" > /tmp/omc_%s.out 2>&1 & \n", strings.Join(omcStrArr, " && "), action)) + cmdStrArr = append(cmdStrArr, fmt.Sprintf("sudo rm -f /tmp/operate_run_%s_omc.out \n", action)) + cmdStrArr = append(cmdStrArr, fmt.Sprintf("nohup sh -c \"sleep 2s && %s\" > /tmp/operate_run_%s_omc.out2>&1 & \n", strings.Join(omcStrArr, " && "), action)) cmdStrArr = append(cmdStrArr, fmt.Sprintf("echo '%s' \n", okFlagStr)) return okFlagStr, cmdStrArr, nil } else if neType == "IMS" {