diff options
Diffstat (limited to 'internal/api/client/status')
-rw-r--r-- | internal/api/client/status/status.go | 5 | ||||
-rw-r--r-- | internal/api/client/status/statusboostedby.go | 15 |
2 files changed, 10 insertions, 10 deletions
diff --git a/internal/api/client/status/status.go b/internal/api/client/status/status.go index abb23f1ca..67f046abd 100644 --- a/internal/api/client/status/status.go +++ b/internal/api/client/status/status.go @@ -22,10 +22,9 @@ import ( "net/http" "strings" - "github.com/sirupsen/logrus" - "github.com/gin-gonic/gin" "github.com/superseriousbusiness/gotosocial/internal/api" + "github.com/superseriousbusiness/gotosocial/internal/log" "github.com/superseriousbusiness/gotosocial/internal/processing" "github.com/superseriousbusiness/gotosocial/internal/router" ) @@ -105,7 +104,7 @@ func (m *Module) Route(r router.Router) error { // muxHandler is a little workaround to overcome the limitations of Gin func (m *Module) muxHandler(c *gin.Context) { - logrus.Debug("entering mux handler") + log.Debug("entering mux handler") ru := c.Request.RequestURI if c.Request.Method == http.MethodGet { diff --git a/internal/api/client/status/statusboostedby.go b/internal/api/client/status/statusboostedby.go index 382b38f7b..fbe447bf4 100644 --- a/internal/api/client/status/statusboostedby.go +++ b/internal/api/client/status/statusboostedby.go @@ -21,9 +21,10 @@ package status import ( "net/http" + "codeberg.org/gruf/go-kv" "github.com/gin-gonic/gin" - "github.com/sirupsen/logrus" "github.com/superseriousbusiness/gotosocial/internal/api" + "github.com/superseriousbusiness/gotosocial/internal/log" "github.com/superseriousbusiness/gotosocial/internal/oauth" ) @@ -64,12 +65,12 @@ import ( // '404': // description: not found func (m *Module) StatusBoostedByGETHandler(c *gin.Context) { - l := logrus.WithFields(logrus.Fields{ - "func": "StatusBoostedByGETHandler", - "request_uri": c.Request.RequestURI, - "user_agent": c.Request.UserAgent(), - "origin_ip": c.ClientIP(), - }) + l := log.WithFields(kv.Fields{ + + {"request_uri", c.Request.RequestURI}, + {"user_agent", c.Request.UserAgent()}, + {"origin_ip", c.ClientIP()}, + }...) l.Debugf("entering function") authed, err := oauth.Authed(c, true, true, true, true) // we don't really need an app here but we want everything else |