From 57659de7a21a456d4e42a3225e7d25de23582a3a Mon Sep 17 00:00:00 2001 From: simonzhangsz Date: Sun, 8 Oct 2023 14:18:18 +0800 Subject: [PATCH] ne & param --- features/cm/ne.go | 3 ++- features/cm/param.go | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/features/cm/ne.go b/features/cm/ne.go index 529d8d98..417ed026 100644 --- a/features/cm/ne.go +++ b/features/cm/ne.go @@ -897,7 +897,8 @@ func PostNeInstanceAction(w http.ResponseWriter, r *http.Request) { return } default: - log.Error("Faile to execute ssh sudo systemctl command:", err) + err = global.ErrCMUnknownInstanceAction + log.Error("%v, action:%s", err, action) services.ResponseInternalServerError500ProcessError(w, err) return } diff --git a/features/cm/param.go b/features/cm/param.go index 35e7b4a3..21a2cdbc 100644 --- a/features/cm/param.go +++ b/features/cm/param.go @@ -81,8 +81,8 @@ func GetParamConfigFromNF(w http.ResponseWriter, r *http.Request) { SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}). Get(requestURI2NF) if err != nil { - log.Error("Get from NF is failure:", err) - services.ResponseInternalServerError500NFConnectRefused(w) + log.Error("Failed to Get from NF:", err) + services.ResponseInternalServerError500ProcessError(w, err) return } else { _ = json.Unmarshal(resp.Body(), &response) @@ -138,7 +138,7 @@ func PostParamConfigToNF(w http.ResponseWriter, r *http.Request) { Post(requestURI2NF) if err != nil { log.Error("Failed to POST to NF:", err) - services.ResponseInternalServerError500NFConnectRefused(w) + services.ResponseInternalServerError500ProcessError(w, err) return } @@ -189,8 +189,8 @@ func PutParamConfigToNF(w http.ResponseWriter, r *http.Request) { SetBody(body). Put(requestURI2NF) if err != nil { - log.Error("Put to NF failed:", err) - services.ResponseInternalServerError500NFConnectRefused(w) + log.Error("Failed to Put to NF:", err) + services.ResponseInternalServerError500ProcessError(w, err) return }