summaryrefslogtreecommitdiff
path: root/internal/web/base.go
diff options
context:
space:
mode:
authorLibravatar R. Aidan Campbell <raidancampbell@users.noreply.github.com>2021-10-11 05:37:33 -0700
committerLibravatar GitHub <noreply@github.com>2021-10-11 14:37:33 +0200
commit083099a9575f8b2fac22c1d4a51a9dd0e2201243 (patch)
treed1787aa544679c433f797d2313ce532250fe574f /internal/web/base.go
parentHandle forwarded messages (#273) (diff)
downloadgotosocial-083099a9575f8b2fac22c1d4a51a9dd0e2201243.tar.xz
reference global logrus (#274)
* 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
Diffstat (limited to 'internal/web/base.go')
-rw-r--r--internal/web/base.go8
1 files changed, 3 insertions, 5 deletions
diff --git a/internal/web/base.go b/internal/web/base.go
index 7be834a46..0eda1185a 100644
--- a/internal/web/base.go
+++ b/internal/web/base.go
@@ -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)