diff options
Diffstat (limited to 'internal/api/client')
| -rw-r--r-- | internal/api/client/fileserver/servefile.go | 4 | ||||
| -rw-r--r-- | internal/api/client/fileserver/servefile_test.go | 4 | ||||
| -rw-r--r-- | internal/api/client/media/mediacreate_test.go | 4 | ||||
| -rw-r--r-- | internal/api/client/media/mediaupdate_test.go | 4 | ||||
| -rw-r--r-- | internal/api/client/status/status.go | 5 | ||||
| -rw-r--r-- | internal/api/client/status/statusboostedby.go | 15 | ||||
| -rw-r--r-- | internal/api/client/streaming/stream.go | 15 |
7 files changed, 26 insertions, 25 deletions
diff --git a/internal/api/client/fileserver/servefile.go b/internal/api/client/fileserver/servefile.go index ac2fa7bc2..fffa15a1c 100644 --- a/internal/api/client/fileserver/servefile.go +++ b/internal/api/client/fileserver/servefile.go @@ -24,10 +24,10 @@ import ( "net/http" "github.com/gin-gonic/gin" - "github.com/sirupsen/logrus" "github.com/superseriousbusiness/gotosocial/internal/api" "github.com/superseriousbusiness/gotosocial/internal/api/model" "github.com/superseriousbusiness/gotosocial/internal/gtserror" + "github.com/superseriousbusiness/gotosocial/internal/log" "github.com/superseriousbusiness/gotosocial/internal/oauth" ) @@ -93,7 +93,7 @@ func (m *FileServer) ServeFile(c *gin.Context) { // if the content is a ReadCloser, close it when we're done if closer, ok := content.Content.(io.ReadCloser); ok { if err := closer.Close(); err != nil { - logrus.Errorf("ServeFile: error closing readcloser: %s", err) + log.Errorf("ServeFile: error closing readcloser: %s", err) } } }() diff --git a/internal/api/client/fileserver/servefile_test.go b/internal/api/client/fileserver/servefile_test.go index e918a9026..8e9cbe548 100644 --- a/internal/api/client/fileserver/servefile_test.go +++ b/internal/api/client/fileserver/servefile_test.go @@ -27,7 +27,6 @@ import ( "testing" "github.com/gin-gonic/gin" - "github.com/sirupsen/logrus" "github.com/stretchr/testify/suite" "github.com/superseriousbusiness/gotosocial/internal/api/client/fileserver" "github.com/superseriousbusiness/gotosocial/internal/concurrency" @@ -35,6 +34,7 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/email" "github.com/superseriousbusiness/gotosocial/internal/federation" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "github.com/superseriousbusiness/gotosocial/internal/log" "github.com/superseriousbusiness/gotosocial/internal/media" "github.com/superseriousbusiness/gotosocial/internal/messages" "github.com/superseriousbusiness/gotosocial/internal/oauth" @@ -96,7 +96,7 @@ func (suite *ServeFileTestSuite) SetupSuite() { func (suite *ServeFileTestSuite) TearDownSuite() { if err := suite.db.Stop(context.Background()); err != nil { - logrus.Panicf("error closing db connection: %s", err) + log.Panicf("error closing db connection: %s", err) } } diff --git a/internal/api/client/media/mediacreate_test.go b/internal/api/client/media/mediacreate_test.go index 935fc2970..595edb73d 100644 --- a/internal/api/client/media/mediacreate_test.go +++ b/internal/api/client/media/mediacreate_test.go @@ -30,7 +30,6 @@ import ( "net/http/httptest" "testing" - "github.com/sirupsen/logrus" "github.com/stretchr/testify/suite" mediamodule "github.com/superseriousbusiness/gotosocial/internal/api/client/media" "github.com/superseriousbusiness/gotosocial/internal/api/model" @@ -40,6 +39,7 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/email" "github.com/superseriousbusiness/gotosocial/internal/federation" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "github.com/superseriousbusiness/gotosocial/internal/log" "github.com/superseriousbusiness/gotosocial/internal/media" "github.com/superseriousbusiness/gotosocial/internal/messages" "github.com/superseriousbusiness/gotosocial/internal/oauth" @@ -100,7 +100,7 @@ func (suite *MediaCreateTestSuite) SetupSuite() { func (suite *MediaCreateTestSuite) TearDownSuite() { if err := suite.db.Stop(context.Background()); err != nil { - logrus.Panicf("error closing db connection: %s", err) + log.Panicf("error closing db connection: %s", err) } } diff --git a/internal/api/client/media/mediaupdate_test.go b/internal/api/client/media/mediaupdate_test.go index deb93d83c..8081a5c15 100644 --- a/internal/api/client/media/mediaupdate_test.go +++ b/internal/api/client/media/mediaupdate_test.go @@ -29,7 +29,6 @@ import ( "testing" "github.com/gin-gonic/gin" - "github.com/sirupsen/logrus" "github.com/stretchr/testify/suite" mediamodule "github.com/superseriousbusiness/gotosocial/internal/api/client/media" "github.com/superseriousbusiness/gotosocial/internal/api/model" @@ -39,6 +38,7 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/email" "github.com/superseriousbusiness/gotosocial/internal/federation" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "github.com/superseriousbusiness/gotosocial/internal/log" "github.com/superseriousbusiness/gotosocial/internal/media" "github.com/superseriousbusiness/gotosocial/internal/messages" "github.com/superseriousbusiness/gotosocial/internal/oauth" @@ -99,7 +99,7 @@ func (suite *MediaUpdateTestSuite) SetupSuite() { func (suite *MediaUpdateTestSuite) TearDownSuite() { if err := suite.db.Stop(context.Background()); err != nil { - logrus.Panicf("error closing db connection: %s", err) + log.Panicf("error closing db connection: %s", err) } } 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 diff --git a/internal/api/client/streaming/stream.go b/internal/api/client/streaming/stream.go index 2c18e4e41..7e2922acf 100644 --- a/internal/api/client/streaming/stream.go +++ b/internal/api/client/streaming/stream.go @@ -5,9 +5,10 @@ import ( "net/http" "time" - "github.com/sirupsen/logrus" + "codeberg.org/gruf/go-kv" "github.com/superseriousbusiness/gotosocial/internal/api" "github.com/superseriousbusiness/gotosocial/internal/gtserror" + "github.com/superseriousbusiness/gotosocial/internal/log" "github.com/gin-gonic/gin" "github.com/gorilla/websocket" @@ -144,12 +145,12 @@ func (m *Module) StreamGETHandler(c *gin.Context) { return } - l := logrus.WithFields(logrus.Fields{ - "account": account.Username, - "path": BasePath, - "streamID": stream.ID, - "streamType": streamType, - }) + l := log.WithFields(kv.Fields{ + {"account", account.Username}, + {"path", BasePath}, + {"streamID", stream.ID}, + {"streamType", streamType}, + }...) wsConn, err := wsUpgrader.Upgrade(c.Writer, c.Request, nil) if err != nil { |