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

3 files changed, 19 insertions, 22 deletions

diff --git a/internal/cliactions/admin/account/account.go b/internal/cliactions/admin/account/account.go
index e9a113f35..5bdee9a41 100644
--- a/internal/cliactions/admin/account/account.go
+++ b/internal/cliactions/admin/account/account.go
@@ -24,7 +24,6 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/sirupsen/logrus"
 	"github.com/superseriousbusiness/gotosocial/internal/cliactions"
 	"github.com/superseriousbusiness/gotosocial/internal/config"
 	"github.com/superseriousbusiness/gotosocial/internal/db"
@@ -35,8 +34,8 @@ import (
 )
 
 // Create creates a new account in the database using the provided flags.
-var Create cliactions.GTSAction = func(ctx context.Context, c *config.Config, log *logrus.Logger) error {
-	dbConn, err := bundb.NewBunDBService(ctx, c, log)
+var Create cliactions.GTSAction = func(ctx context.Context, c *config.Config) error {
+	dbConn, err := bundb.NewBunDBService(ctx, c)
 	if err != nil {
 		return fmt.Errorf("error creating dbservice: %s", err)
 	}
@@ -74,8 +73,8 @@ var Create cliactions.GTSAction = func(ctx context.Context, c *config.Config, lo
 }
 
 // Confirm sets a user to Approved, sets Email to the current UnconfirmedEmail value, and sets ConfirmedAt to now.
-var Confirm cliactions.GTSAction = func(ctx context.Context, c *config.Config, log *logrus.Logger) error {
-	dbConn, err := bundb.NewBunDBService(ctx, c, log)
+var Confirm cliactions.GTSAction = func(ctx context.Context, c *config.Config) error {
+	dbConn, err := bundb.NewBunDBService(ctx, c)
 	if err != nil {
 		return fmt.Errorf("error creating dbservice: %s", err)
 	}
@@ -109,8 +108,8 @@ var Confirm cliactions.GTSAction = func(ctx context.Context, c *config.Config, l
 }
 
 // Promote sets a user to admin.
-var Promote cliactions.GTSAction = func(ctx context.Context, c *config.Config, log *logrus.Logger) error {
-	dbConn, err := bundb.NewBunDBService(ctx, c, log)
+var Promote cliactions.GTSAction = func(ctx context.Context, c *config.Config) error {
+	dbConn, err := bundb.NewBunDBService(ctx, c)
 	if err != nil {
 		return fmt.Errorf("error creating dbservice: %s", err)
 	}
@@ -141,8 +140,8 @@ var Promote cliactions.GTSAction = func(ctx context.Context, c *config.Config, l
 }
 
 // Demote sets admin on a user to false.
-var Demote cliactions.GTSAction = func(ctx context.Context, c *config.Config, log *logrus.Logger) error {
-	dbConn, err := bundb.NewBunDBService(ctx, c, log)
+var Demote cliactions.GTSAction = func(ctx context.Context, c *config.Config) error {
+	dbConn, err := bundb.NewBunDBService(ctx, c)
 	if err != nil {
 		return fmt.Errorf("error creating dbservice: %s", err)
 	}
@@ -173,8 +172,8 @@ var Demote cliactions.GTSAction = func(ctx context.Context, c *config.Config, lo
 }
 
 // Disable sets Disabled to true on a user.
-var Disable cliactions.GTSAction = func(ctx context.Context, c *config.Config, log *logrus.Logger) error {
-	dbConn, err := bundb.NewBunDBService(ctx, c, log)
+var Disable cliactions.GTSAction = func(ctx context.Context, c *config.Config) error {
+	dbConn, err := bundb.NewBunDBService(ctx, c)
 	if err != nil {
 		return fmt.Errorf("error creating dbservice: %s", err)
 	}
@@ -205,14 +204,14 @@ var Disable cliactions.GTSAction = func(ctx context.Context, c *config.Config, l
 }
 
 // Suspend suspends the target account, cleanly removing all of its media, followers, following, likes, statuses, etc.
-var Suspend cliactions.GTSAction = func(ctx context.Context, c *config.Config, log *logrus.Logger) error {
+var Suspend cliactions.GTSAction = func(ctx context.Context, c *config.Config) error {
 	// TODO
 	return nil
 }
 
 // Password sets the password of target account.
-var Password cliactions.GTSAction = func(ctx context.Context, c *config.Config, log *logrus.Logger) error {
-	dbConn, err := bundb.NewBunDBService(ctx, c, log)
+var Password cliactions.GTSAction = func(ctx context.Context, c *config.Config) error {
+	dbConn, err := bundb.NewBunDBService(ctx, c)
 	if err != nil {
 		return fmt.Errorf("error creating dbservice: %s", err)
 	}
diff --git a/internal/cliactions/admin/trans/export.go b/internal/cliactions/admin/trans/export.go
index 3d9607ea6..89a22a357 100644
--- a/internal/cliactions/admin/trans/export.go
+++ b/internal/cliactions/admin/trans/export.go
@@ -23,7 +23,6 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/sirupsen/logrus"
 	"github.com/superseriousbusiness/gotosocial/internal/cliactions"
 	"github.com/superseriousbusiness/gotosocial/internal/config"
 	"github.com/superseriousbusiness/gotosocial/internal/db/bundb"
@@ -31,13 +30,13 @@ import (
 )
 
 // Export exports info from the database into a file
-var Export cliactions.GTSAction = func(ctx context.Context, c *config.Config, log *logrus.Logger) error {
-	dbConn, err := bundb.NewBunDBService(ctx, c, log)
+var Export cliactions.GTSAction = func(ctx context.Context, c *config.Config) error {
+	dbConn, err := bundb.NewBunDBService(ctx, c)
 	if err != nil {
 		return fmt.Errorf("error creating dbservice: %s", err)
 	}
 
-	exporter := trans.NewExporter(dbConn, log)
+	exporter := trans.NewExporter(dbConn)
 
 	path, ok := c.ExportCLIFlags[config.TransPathFlag]
 	if !ok {
diff --git a/internal/cliactions/admin/trans/import.go b/internal/cliactions/admin/trans/import.go
index 7b137eccc..82defde74 100644
--- a/internal/cliactions/admin/trans/import.go
+++ b/internal/cliactions/admin/trans/import.go
@@ -23,7 +23,6 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/sirupsen/logrus"
 	"github.com/superseriousbusiness/gotosocial/internal/cliactions"
 	"github.com/superseriousbusiness/gotosocial/internal/config"
 	"github.com/superseriousbusiness/gotosocial/internal/db/bundb"
@@ -31,13 +30,13 @@ import (
 )
 
 // Import imports info from a file into the database
-var Import cliactions.GTSAction = func(ctx context.Context, c *config.Config, log *logrus.Logger) error {
-	dbConn, err := bundb.NewBunDBService(ctx, c, log)
+var Import cliactions.GTSAction = func(ctx context.Context, c *config.Config) error {
+	dbConn, err := bundb.NewBunDBService(ctx, c)
 	if err != nil {
 		return fmt.Errorf("error creating dbservice: %s", err)
 	}
 
-	importer := trans.NewImporter(dbConn, log)
+	importer := trans.NewImporter(dbConn)
 
 	path, ok := c.ExportCLIFlags[config.TransPathFlag]
 	if !ok {