reference logrus' global logger instead of passing and storing a logger reference everywhere

This commit is contained in:
R. Aidan Campbell 2021-10-10 07:49:50 -07:00
commit 1f7049a7c3
No known key found for this signature in database
GPG key ID: 0985399E9CD6A99B
202 changed files with 443 additions and 561 deletions

View file

@ -21,7 +21,6 @@ package nodeinfo
import (
"net/http"
"github.com/sirupsen/logrus"
"github.com/superseriousbusiness/gotosocial/internal/api"
"github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/processing"
@ -39,15 +38,13 @@ const (
type Module struct {
config *config.Config
processor processing.Processor
log *logrus.Logger
}
// New returns a new nodeinfo module
func New(config *config.Config, processor processing.Processor, log *logrus.Logger) api.FederationModule {
func New(config *config.Config, processor processing.Processor) api.FederationModule {
return &Module{
config: config,
processor: processor,
log: log,
}
}

View file

@ -28,7 +28,7 @@ import (
// NodeInfoGETHandler returns a compliant nodeinfo response to node info queries.
// See: https://nodeinfo.diaspora.software/
func (m *Module) NodeInfoGETHandler(c *gin.Context) {
l := m.log.WithFields(logrus.Fields{
l := logrus.WithFields(logrus.Fields{
"func": "NodeInfoGETHandler",
"user-agent": c.Request.UserAgent(),
})

View file

@ -28,7 +28,7 @@ import (
// NodeInfoWellKnownGETHandler returns a well known response to a query to /.well-known/nodeinfo,
// directing (but not redirecting...) callers to the NodeInfoGETHandler.
func (m *Module) NodeInfoWellKnownGETHandler(c *gin.Context) {
l := m.log.WithFields(logrus.Fields{
l := logrus.WithFields(logrus.Fields{
"func": "NodeInfoWellKnownGETHandler",
"user-agent": c.Request.UserAgent(),
})