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

[API] on 500 error only show message if gitea in dev mode #11641

Merged
merged 9 commits into from
Jun 3, 2020
Merged

[API] on 500 error only show message if gitea in dev mode #11641

Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6622cea
add API specific InternalServerError()
6543 May 24, 2020
94d3874
return 500 error msg only if not Production mode
6543 May 26, 2020
3ca324b
Merge branch 'master' into API_InternalServerError_message-only-if-dev
6543 May 28, 2020
53dd28b
rm unnessesary change
6543 May 28, 2020
f887b4e
Merge branch 'master' into API_InternalServerError_message-only-if-dev
6543 May 29, 2020
f96fee9
Merge branch 'master' into API_InternalServerError_message-only-if-dev
6543 Jun 1, 2020
ebd2762
Merge branch 'master' into API_InternalServerError_message-only-if-dev
6543 Jun 3, 2020
02a4455
Merge branch 'master' into API_InternalServerError_message-only-if-dev
6543 Jun 3, 2020
ffcd8e5
Merge branch 'master' into API_InternalServerError_message-only-if-dev
6543 Jun 3, 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
5 changes: 5 additions & 0 deletions 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

6543 marked this conversation as resolved.
Show resolved Hide resolved
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 = ""
6543 marked this conversation as resolved.
Show resolved Hide resolved
}
}

ctx.JSON(status, APIError{
Expand Down