Skip to content

Commit

Permalink
add API specific InternalServerError()
Browse files Browse the repository at this point in the history
  • Loading branch information
6543 committed May 24, 2020
1 parent 788b8b1 commit 360083a
Showing 1 changed file with 15 additions and 3 deletions.
18 changes: 15 additions & 3 deletions modules/context/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ package context

import (
"fmt"
"net/http"
"net/url"
"strings"

Expand Down Expand Up @@ -64,7 +65,7 @@ type APINotFound struct{}
// swagger:response redirect
type APIRedirect struct{}

// Error responses error message to client with given message.
// Error responds with an error message to client with given obj as the message.
// If status is 500, also it prints error to log.
func (ctx *APIContext) Error(status int, title string, obj interface{}) {
var message string
Expand All @@ -74,8 +75,8 @@ func (ctx *APIContext) Error(status int, title string, obj interface{}) {
message = obj.(string)
}

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

ctx.JSON(status, APIError{
Expand All @@ -84,6 +85,17 @@ func (ctx *APIContext) Error(status int, title string, obj interface{}) {
})
}

// InternalServerError responds with an error message to the client with the error as a message
// and the file and line of the caller.
func (ctx *APIContext) InternalServerError(err error) {
log.ErrorWithSkip(1, "InternalServerError: %v", err)

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

func genAPILinks(curURL *url.URL, total, pageSize, curPage int) []string {
page := NewPagination(total, pageSize, curPage, 0)
paginater := page.Paginater
Expand Down

0 comments on commit 360083a

Please sign in to comment.