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

Jump to bottom

Return json on 500 error from API #11574

Merged
merged 10 commits into from
May 28, 2020
Merged

Return json on 500 error from API #11574

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
360083a
add API specific InternalServerError()
6543 May 24, 2020
9f59afe
why not ...
6543 May 24, 2020
cd7b120
Merge branch 'master' into api_return-json-error
6543 May 24, 2020
8467b2c
return 500 error msg only if not Production mode
6543 May 26, 2020
fc3dec0
Merge branch 'master' into api_return-json-error
6543 May 26, 2020
1da3b28
Merge branch 'master' into api_return-json-error
6543 May 27, 2020
6f32067
Revert "return 500 error msg only if not Production mode"
6543 May 27, 2020
497f226
InternalServerError
6543 May 27, 2020
ebc338c
Merge branch 'master' into api_return-json-error
6543 May 28, 2020
b338283
Merge branch 'master' into api_return-json-error
6543 May 28, 2020
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
Prev Previous commit
Next Next commit
return 500 error msg only if not Production mode
  • Loading branch information
@6543
6543 committed May 26, 2020
commit 8467b2cee674ad205b452780ca88abb1b27643c8
12 changes: 11 additions & 1 deletion modules/context/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ type APIRedirect struct{}
// If status is 500, also it prints error to log.
func (ctx *APIContext) Error(status int, title string, obj interface{}) {
var message string

if err, ok := obj.(error); ok {
message = err.Error()
} else {
Expand All @@ -77,6 +78,10 @@ func (ctx *APIContext) Error(status int, title string, obj interface{}) {

if status == http.StatusInternalServerError {
log.ErrorWithSkip(1, "%s: %s", title, message)

if macaron.Env == macaron.PROD {
message = ""
}
}

ctx.JSON(status, APIError{
Expand All @@ -90,8 +95,13 @@ func (ctx *APIContext) Error(status int, title string, obj interface{}) {
func (ctx *APIContext) InternalServerError(err error) {
log.ErrorWithSkip(1, "InternalServerError: %v", err)

var message string
if macaron.Env != macaron.PROD {
message = err.Error()
}

ctx.JSON(http.StatusInternalServerError, APIError{
Message: err.Error(),
Message: message,
URL: setting.API.SwaggerURL,
})
}
Expand Down