summaryrefslogtreecommitdiff
path: root/internal/api/client/admin
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/api/client/admin
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/api/client/admin')
-rw-r--r--internal/api/client/admin/admin.go5
-rw-r--r--internal/api/client/admin/domainblockcreate.go2
-rw-r--r--internal/api/client/admin/domainblockdelete.go2
-rw-r--r--internal/api/client/admin/domainblockget.go2
-rw-r--r--internal/api/client/admin/domainblocksget.go2
-rw-r--r--internal/api/client/admin/emojicreate.go2
6 files changed, 6 insertions, 9 deletions
diff --git a/internal/api/client/admin/admin.go b/internal/api/client/admin/admin.go
index eeec5196e..35d162139 100644
--- a/internal/api/client/admin/admin.go
+++ b/internal/api/client/admin/admin.go
@@ -21,7 +21,6 @@ package admin
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"
@@ -50,15 +49,13 @@ const (
type Module struct {
config *config.Config
processor processing.Processor
- log *logrus.Logger
}
// New returns a new admin module
-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,
processor: processor,
- log: log,
}
}
diff --git a/internal/api/client/admin/domainblockcreate.go b/internal/api/client/admin/domainblockcreate.go
index 9ef4c6f92..e1b6bb032 100644
--- a/internal/api/client/admin/domainblockcreate.go
+++ b/internal/api/client/admin/domainblockcreate.go
@@ -90,7 +90,7 @@ import (
// '400':
// description: bad request
func (m *Module) DomainBlocksPOSTHandler(c *gin.Context) {
- l := m.log.WithFields(logrus.Fields{
+ l := logrus.WithFields(logrus.Fields{
"func": "DomainBlocksPOSTHandler",
"request_uri": c.Request.RequestURI,
"user_agent": c.Request.UserAgent(),
diff --git a/internal/api/client/admin/domainblockdelete.go b/internal/api/client/admin/domainblockdelete.go
index 64e4ef6de..9c6f97ca2 100644
--- a/internal/api/client/admin/domainblockdelete.go
+++ b/internal/api/client/admin/domainblockdelete.go
@@ -42,7 +42,7 @@ import (
// '404':
// description: not found
func (m *Module) DomainBlockDELETEHandler(c *gin.Context) {
- l := m.log.WithFields(logrus.Fields{
+ l := logrus.WithFields(logrus.Fields{
"func": "DomainBlockDELETEHandler",
"request_uri": c.Request.RequestURI,
"user_agent": c.Request.UserAgent(),
diff --git a/internal/api/client/admin/domainblockget.go b/internal/api/client/admin/domainblockget.go
index d23f99a8c..b9dabcd80 100644
--- a/internal/api/client/admin/domainblockget.go
+++ b/internal/api/client/admin/domainblockget.go
@@ -43,7 +43,7 @@ import (
// '404':
// description: not found
func (m *Module) DomainBlockGETHandler(c *gin.Context) {
- l := m.log.WithFields(logrus.Fields{
+ l := logrus.WithFields(logrus.Fields{
"func": "DomainBlockGETHandler",
"request_uri": c.Request.RequestURI,
"user_agent": c.Request.UserAgent(),
diff --git a/internal/api/client/admin/domainblocksget.go b/internal/api/client/admin/domainblocksget.go
index dad8250e0..979fc4a69 100644
--- a/internal/api/client/admin/domainblocksget.go
+++ b/internal/api/client/admin/domainblocksget.go
@@ -49,7 +49,7 @@ import (
// '404':
// description: not found
func (m *Module) DomainBlocksGETHandler(c *gin.Context) {
- l := m.log.WithFields(logrus.Fields{
+ l := logrus.WithFields(logrus.Fields{
"func": "DomainBlocksGETHandler",
"request_uri": c.Request.RequestURI,
"user_agent": c.Request.UserAgent(),
diff --git a/internal/api/client/admin/emojicreate.go b/internal/api/client/admin/emojicreate.go
index 38928a9d8..89325c47a 100644
--- a/internal/api/client/admin/emojicreate.go
+++ b/internal/api/client/admin/emojicreate.go
@@ -74,7 +74,7 @@ import (
// '400':
// description: bad request
func (m *Module) emojiCreatePOSTHandler(c *gin.Context) {
- l := m.log.WithFields(logrus.Fields{
+ l := logrus.WithFields(logrus.Fields{
"func": "emojiCreatePOSTHandler",
"request_uri": c.Request.RequestURI,
"user_agent": c.Request.UserAgent(),