From 5ca6659621b40b665adcb83933d710e0ec9790f4 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Fri, 20 Sep 2024 17:24:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B7=9F=E8=B8=AA=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=9D=9E201/400=E6=97=B6=E6=8E=A5=E6=94=B6?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/network_element/fetch_link/ne_trace.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/modules/network_element/fetch_link/ne_trace.go b/src/modules/network_element/fetch_link/ne_trace.go index a90f93bf..387633fa 100644 --- a/src/modules/network_element/fetch_link/ne_trace.go +++ b/src/modules/network_element/fetch_link/ne_trace.go @@ -14,7 +14,7 @@ import ( func NeTraceInfo(neInfo model.NeInfo, traceId string) (map[string]any, error) { // 跟踪任务信息 neUrl := fmt.Sprintf("http://%s:%d/api/rest/traceManagement/v1/subscriptions?id=%s", neInfo.IP, neInfo.Port, traceId) - resBytes, err := fetch.Get(neUrl, nil, 60_000) + resBytes, err := fetch.Get(neUrl, nil, 30_000) if err != nil { logger.Warnf("NeTraceInfo Get \"%s\"", neUrl) logger.Errorf("NeTraceInfo %s", err.Error()) @@ -40,11 +40,10 @@ func NeTraceAdd(neInfo model.NeInfo, data map[string]any) (map[string]any, error if err != nil { errStr := err.Error() logger.Warnf("NeTraceAdd POST \"%s\"", neUrl) - if strings.HasPrefix(errStr, "201") || strings.HasPrefix(errStr, "204") { - return resData, nil + if !(strings.HasPrefix(errStr, "201") || strings.HasPrefix(errStr, "400")) { + logger.Errorf("NeTraceAdd %s", errStr) + return nil, fmt.Errorf("NeService Trace Add API Error") } - logger.Errorf("NeTraceAdd %s", errStr) - return nil, fmt.Errorf("NeService Trace Add API Error") } // 200 成功无数据时