test1234
/
gitea
forked from gitea/gitea
1
0
Fork 0
Code Pull Requests Activity

wrap the ServerError and NotFound and log from the caller (#6550)

This commit is contained in:
zeripath 2019-04-09 19:10:42 +01:00 committed by Lauris BH
parent 2b9b3310f6
commit 0af0b078f9
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/context/context.go
View File

@ -151,8 +151,12 @@ func (ctx *Context) RenderWithErr(msg string, tpl base.TplName, form interface{}
// NotFound displays a 404 (Not Found) page and prints the given error, if any. // NotFound displays a 404 (Not Found) page and prints the given error, if any.
func (ctx *Context) NotFound(title string, err error) { func (ctx *Context) NotFound(title string, err error) {
ctx.notFoundInternal(title, err)
}
func (ctx *Context) notFoundInternal(title string, err error) {
if err != nil { if err != nil {
log.Error("%s: %v", title, err) log.ErrorWithSkip(2, "%s: %v", title, err)
if macaron.Env != macaron.PROD { if macaron.Env != macaron.PROD {
ctx.Data["ErrorMsg"] = err ctx.Data["ErrorMsg"] = err
} }
@ -166,8 +170,12 @@ func (ctx *Context) NotFound(title string, err error) {
// ServerError displays a 500 (Internal Server Error) page and prints the given // ServerError displays a 500 (Internal Server Error) page and prints the given
// error, if any. // error, if any.
func (ctx *Context) ServerError(title string, err error) { func (ctx *Context) ServerError(title string, err error) {
ctx.serverErrorInternal(title, err)
}
func (ctx *Context) serverErrorInternal(title string, err error) {
if err != nil { if err != nil {
log.Error("%s: %v", title, err) log.ErrorWithSkip(2, "%s: %v", title, err)
if macaron.Env != macaron.PROD { if macaron.Env != macaron.PROD {
ctx.Data["ErrorMsg"] = err ctx.Data["ErrorMsg"] = err
} }
@ -182,11 +190,11 @@ func (ctx *Context) ServerError(title string, err error) {
// or error context description for logging purpose of 500 server error. // or error context description for logging purpose of 500 server error.
func (ctx *Context) NotFoundOrServerError(title string, errck func(error) bool, err error) { func (ctx *Context) NotFoundOrServerError(title string, errck func(error) bool, err error) {
if errck(err) { if errck(err) {
ctx.NotFound(title, err) ctx.notFoundInternal(title, err)
return return
} }
ctx.ServerError(title, err) ctx.serverErrorInternal(title, err)
} }
// HandleText handles HTTP status code // HandleText handles HTTP status code