SuperSeriousBusiness/GoToSocial
1
1
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial synced 2025-06-05 21:59:39 +02:00
Code Issues Projects Releases Wiki Activity

reference global logrus (#274)

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

* always directly use global logrus logger instead of referencing an instance

* test suites should also directly use the global logrus logger

* rename gin logging function to clarify that it's middleware

* correct comments which erroneously referenced removed logger parameter

* setting log level for tests now uses logrus' exported type instead of the string value, to guarantee error isn't possible
This commit is contained in:
R. Aidan Campbell
2021-10-11 05:37:33 -07:00
committed by GitHub
parent 367bdca250
commit 083099a957
210 changed files with 506 additions and 662 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/web/base.go
View File

@@ -36,20 +36,18 @@ import (
type Module struct {
config *config.Config
processor processing.Processor
log *logrus.Logger
}
// New returns a new api.ClientModule for web pages.
func New(config *config.Config, processor processing.Processor, log *logrus.Logger) api.ClientModule {
func New(config *config.Config, processor processing.Processor) api.ClientModule {
return &Module{
config: config,
log: log,
processor: processor,
}
}
func (m *Module) baseHandler(c *gin.Context) {
l := m.log.WithField("func", "BaseGETHandler")
l := logrus.WithField("func", "BaseGETHandler")
l.Trace("serving index html")
instance, err := m.processor.InstanceGet(c.Request.Context(), m.config.Host)
@@ -66,7 +64,7 @@ func (m *Module) baseHandler(c *gin.Context) {
// NotFoundHandler serves a 404 html page instead of a blank 404 error.
func (m *Module) NotFoundHandler(c *gin.Context) {
l := m.log.WithField("func", "404")
l := logrus.WithField("func", "404")
l.Trace("serving 404 html")
instance, err := m.processor.InstanceGet(c.Request.Context(), m.config.Host)