Skip to content

Commit cd137eb

Browse files
authored
Cnsclientlog fix (#1960)
* cnsclient log fix
1 parent 62e7e19 commit cd137eb

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

cns/restserver/api.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -888,18 +888,23 @@ func (service *HTTPRestService) getAllNetworkContainers(w http.ResponseWriter, r
888888

889889
var resp cns.GetAllNetworkContainersResponse
890890

891-
failedNCs := make([]string, 0)
891+
failedNetworkContainerResponses := make([]cns.GetNetworkContainerResponse, 0)
892892
for i := 0; i < len(getAllNetworkContainerResponses); i++ {
893893
if getAllNetworkContainerResponses[i].Response.ReturnCode != types.Success {
894-
failedNCs = append(failedNCs, getAllNetworkContainerResponses[i].NetworkContainerID)
894+
failedNetworkContainerResponses = append(failedNetworkContainerResponses, getAllNetworkContainerResponses[i])
895895
}
896896
}
897897

898898
resp.NetworkContainers = getAllNetworkContainerResponses
899899

900-
if len(failedNCs) > 0 {
900+
if len(failedNetworkContainerResponses) > 0 {
901+
failedToGetNCErrMsg := make([]string, 0)
902+
for _, failedNetworkContainerResponse := range failedNetworkContainerResponses { // nolint
903+
failedToGetNCErrMsg = append(failedToGetNCErrMsg, fmt.Sprintf("Failed to get NC %s due to %s", failedNetworkContainerResponse.NetworkContainerID, failedNetworkContainerResponse.Response.Message))
904+
}
905+
901906
resp.Response.ReturnCode = types.UnexpectedError
902-
resp.Response.Message = fmt.Sprintf("Failed to get NCs %s", strings.Join(failedNCs, ","))
907+
resp.Response.Message = strings.Join(failedToGetNCErrMsg, "\n")
903908
} else {
904909
resp.Response.ReturnCode = types.Success
905910
resp.Response.Message = "Successfully retrieved NCs"

0 commit comments

Comments
 (0)