From 77b095a8c32c423dea495f94babe49d7f169f060 Mon Sep 17 00:00:00 2001
From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com>
Date: Fri, 20 Sep 2024 13:30:33 +0000
Subject: [chore] ensure consistent caller name fetching regardless of compiler
 inlining (#3323)

* move logging levels into log package itself

* ensure inconsistent inlining doesn't mess with log calling function name

* remove unused global variable

* fix log level
---
 internal/middleware/logger.go | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'internal/middleware/logger.go')

diff --git a/internal/middleware/logger.go b/internal/middleware/logger.go
index 89a0c396d..097c73cbd 100644
--- a/internal/middleware/logger.go
+++ b/internal/middleware/logger.go
@@ -26,7 +26,6 @@ import (
 	"codeberg.org/gruf/go-bytesize"
 	"codeberg.org/gruf/go-errors/v2"
 	"codeberg.org/gruf/go-kv"
-	"codeberg.org/gruf/go-logger/v2/level"
 	"github.com/gin-gonic/gin"
 	"github.com/superseriousbusiness/gotosocial/internal/gtscontext"
 	"github.com/superseriousbusiness/gotosocial/internal/gtserror"
@@ -99,11 +98,11 @@ func Logger(logClientIP bool) gin.HandlerFunc {
 			l = l.WithFields(fields...)
 
 			// Default is info
-			lvl := level.INFO
+			lvl := log.INFO
 
 			if code >= 500 {
-				// Actual server error.
-				lvl = level.ERROR
+				// Actual error.
+				lvl = log.ERROR
 			}
 
 			if len(c.Errors) > 0 {
-- 
cgit v1.2.3