IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Reqcontext: Use err status code instead of always fallback (#63974)

Browse Source
This commit is contained in:
Ezequiel Victorero
2023-03-01 17:11:16 -03:00
committed by GitHub
parent 1fb2e7bba9
commit 8bd4e2cb25
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/services/contexthandler/model/model.go
View File

@@ -103,6 +103,8 @@ func (ctx *ReqContext) WriteErrOrFallback(status int, message string, err error)
func (ctx *ReqContext) writeErrOrFallback(status int, message string, err error) { func (ctx *ReqContext) writeErrOrFallback(status int, message string, err error) {
data := make(map[string]interface{}) data := make(map[string]interface{})
statusResponse := status
traceID := tracing.TraceIDFromContext(ctx.Req.Context(), false) traceID := tracing.TraceIDFromContext(ctx.Req.Context(), false)
if err != nil { if err != nil {
@@ -121,6 +123,8 @@ func (ctx *ReqContext) writeErrOrFallback(status int, message string, err error)
data["message"] = publicErr.Message data["message"] = publicErr.Message
data["messageId"] = publicErr.MessageID data["messageId"] = publicErr.MessageID
data["statusCode"] = publicErr.StatusCode data["statusCode"] = publicErr.StatusCode
statusResponse = publicErr.StatusCode
} else { } else {
if message != "" { if message != "" {
logMessage = message logMessage = message
@@ -141,7 +145,7 @@ func (ctx *ReqContext) writeErrOrFallback(status int, message string, err error)
data["message"] = message data["message"] = message
} }
ctx.JSON(status, data) ctx.JSON(statusResponse, data)
} }
func (ctx *ReqContext) HasUserRole(role org.RoleType) bool { func (ctx *ReqContext) HasUserRole(role org.RoleType) bool {