Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix backend error logging #2484

Merged
merged 1 commit into from
Jun 21, 2018
Merged

Fix backend error logging #2484

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/backend/app-core/passthrough.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,17 +122,19 @@ func buildJSONResponse(cnsiList []string, responses map[string]*interfaces.CNSIR
errorResponse = cnsiResponse.Response
}
}
if len(response) > 0 {
jsonResponse[guid] = (*json.RawMessage)(&response)
} else if errorStatus.StatusCode >= 0 {
if errorStatus.StatusCode >= 0 {
passthroughError := &PassthroughError{
Error: errorStatus,
ErrorResponse: (*json.RawMessage)(&errorResponse),
}
res, _ := json.Marshal(passthroughError)
jsonResponse[guid] = (*json.RawMessage)(&res)
} else {
jsonResponse[guid] = nil
if len(response) > 0 {
jsonResponse[guid] = (*json.RawMessage)(&response)
} else {
jsonResponse[guid] = nil
}
}
}

Expand All @@ -142,7 +144,7 @@ func buildJSONResponse(cnsiList []string, responses map[string]*interfaces.CNSIR
// When we move to goland 1.9 we can use json.isValid()
func isValidJSON(data []byte) bool {
var res interface{}
err := json.Unmarshal(data, res)
err := json.Unmarshal(data, &res)
return err == nil
}

Expand Down Expand Up @@ -395,7 +397,6 @@ func (p *portalProxy) doRequest(cnsiRequest *interfaces.CNSIRequest, done chan<-
log.Warnf("Passthrough response: URL: %s, Status Code: %d, Status: %s, Content Type: %s, Length: %d",
cnsiRequest.URL.String(), cnsiRequest.StatusCode, cnsiRequest.Status, contentType, contentLength)
log.Warn(string(cnsiRequest.Response))

}

if done != nil {
Expand Down