2 files changed, 11 insertions, 11 deletions
diff --git a/internal/media/handler.go b/internal/media/handler.go
index 429dee88a..fb4ed307e 100644
--- a/internal/media/handler.go
+++ b/internal/media/handler.go
@@ -87,16 +87,14 @@ type mediaHandler struct {
 	config  *config.Config
 	db      db.DB
 	storage *kv.KVStore
-	log     *logrus.Logger
 }
 
-// New returns a new handler with the given config, db, storage, and logger
-func New(config *config.Config, database db.DB, storage *kv.KVStore, log *logrus.Logger) Handler {
+// New returns a new handler with the given config, db, and storage
+func New(config *config.Config, database db.DB, storage *kv.KVStore) Handler {
 	return &mediaHandler{
 		config:  config,
 		db:      database,
 		storage: storage,
-		log:     log,
 	}
 }
 
@@ -108,7 +106,7 @@ func New(config *config.Config, database db.DB, storage *kv.KVStore, log *logrus
 // puts it in whatever storage backend we're using, sets the relevant fields in the database for the new image,
 // and then returns information to the caller about the new header.
 func (mh *mediaHandler) ProcessHeaderOrAvatar(ctx context.Context, attachment []byte, accountID string, mediaType Type, remoteURL string) (*gtsmodel.MediaAttachment, error) {
-	l := mh.log.WithField("func", "SetHeaderForAccountID")
+	l := logrus.WithField("func", "SetHeaderForAccountID")
 
 	if mediaType != Header && mediaType != Avatar {
 		return nil, errors.New("header or avatar not selected")
diff --git a/internal/media/util_test.go b/internal/media/util_test.go
index 9ba0f76ef..c54fb6f2c 100644
--- a/internal/media/util_test.go
+++ b/internal/media/util_test.go
@@ -19,16 +19,16 @@
 package media
 
 import (
+	"github.com/sirupsen/logrus"
+	"github.com/superseriousbusiness/gotosocial/internal/log"
 	"io/ioutil"
 	"testing"
 
-	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/suite"
 )
 
 type MediaUtilTestSuite struct {
 	suite.Suite
-	log *logrus.Logger
 }
 
 /*
@@ -37,10 +37,12 @@ type MediaUtilTestSuite struct {
 
 // SetupSuite sets some variables on the suite that we can use as consts (more or less) throughout
 func (suite *MediaUtilTestSuite) SetupSuite() {
-	// some of our subsequent entities need a log so create this here
-	log := logrus.New()
-	log.SetLevel(logrus.TraceLevel)
-	suite.log = log
+	// doesn't use testrig.InitTestLog() helper to prevent import cycle
+	err := log.Initialize(logrus.TraceLevel.String())
+	if err != nil {
+		panic(err)
+	}
+
 }
 
 func (suite *MediaUtilTestSuite) TearDownSuite() {