Browse Source

return 500 error msg only if not Production mode

pull/11574/head
6543 4 years ago
parent
commit
8467b2cee6
No account linked to committer's email address
1 changed files with 11 additions and 1 deletions
  1. 11
    1
      modules/context/api.go

+ 11
- 1
modules/context/api.go View File

@@ -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 {
@@ -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{
@@ -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,
})
}

Loading…
Cancel
Save