From c39dd1f1fd03b8dee8126ce6a64a62a3378fbab9 Mon Sep 17 00:00:00 2001 From: forgejo-backport-action Date: Wed, 16 Jul 2025 20:14:09 +0200 Subject: [PATCH] [v11.0/forgejo] fix(packages): skip another stack frame from logging (#8531) **Backport:** https://codeberg.org/forgejo/forgejo/pulls/8530 Log the right stack frame line. We currently always show the `apiError` method call. related to #8529 Co-authored-by: Michael Kriese Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/8531 Reviewed-by: Gusted Co-authored-by: forgejo-backport-action Co-committed-by: forgejo-backport-action --- routers/api/packages/helper/helper.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/routers/api/packages/helper/helper.go b/routers/api/packages/helper/helper.go index 99c0867bbb..09cdd18030 100644 --- a/routers/api/packages/helper/helper.go +++ b/routers/api/packages/helper/helper.go @@ -25,7 +25,8 @@ func LogAndProcessError(ctx *context.Context, status int, obj any, cb func(strin message = fmt.Sprintf("%s", obj) } if status == http.StatusInternalServerError { - log.ErrorWithSkip(1, message) + // LogAndProcessError is always wrapped in a `apiError` call, so we need to skip two frames + log.ErrorWithSkip(2, message) if setting.IsProd && (ctx.Doer == nil || !ctx.Doer.IsAdmin) { message = ""