7 files changed, 14 insertions, 15 deletions
diff --git a/internal/transport/controller.go b/internal/transport/controller.go
index c2f5026e0..9b22928d4 100644
--- a/internal/transport/controller.go
+++ b/internal/transport/controller.go
@@ -26,7 +26,6 @@ import (
 
 	"github.com/go-fed/activity/pub"
 	"github.com/go-fed/httpsig"
-	"github.com/sirupsen/logrus"
 	"github.com/superseriousbusiness/gotosocial/internal/config"
 	"github.com/superseriousbusiness/gotosocial/internal/db"
 )
@@ -43,18 +42,16 @@ type controller struct {
 	clock    pub.Clock
 	client   pub.HttpClient
 	appAgent string
-	log      *logrus.Logger
 }
 
 // NewController returns an implementation of the Controller interface for creating new transports
-func NewController(config *config.Config, db db.DB, clock pub.Clock, client pub.HttpClient, log *logrus.Logger) Controller {
+func NewController(config *config.Config, db db.DB, clock pub.Clock, client pub.HttpClient) Controller {
 	return &controller{
 		config:   config,
 		db:       db,
 		clock:    clock,
 		client:   client,
 		appAgent: fmt.Sprintf("%s %s", config.ApplicationName, config.Host),
-		log:      log,
 	}
 }
 
@@ -87,7 +84,6 @@ func (c *controller) NewTransport(pubKeyID string, privkey crypto.PrivateKey) (T
 		sigTransport: sigTransport,
 		getSigner:    getSigner,
 		getSignerMu:  &sync.Mutex{},
-		log:          c.log,
 	}, nil
 }
 
diff --git a/internal/transport/deliver.go b/internal/transport/deliver.go
index fd0fb576f..5a522874a 100644
--- a/internal/transport/deliver.go
+++ b/internal/transport/deliver.go
@@ -20,6 +20,7 @@ package transport
 
 import (
 	"context"
+	"github.com/sirupsen/logrus"
 	"net/url"
 )
 
@@ -28,7 +29,7 @@ func (t *transport) BatchDeliver(ctx context.Context, b []byte, recipients []*ur
 }
 
 func (t *transport) Deliver(ctx context.Context, b []byte, to *url.URL) error {
-	l := t.log.WithField("func", "Deliver")
+	l := logrus.WithField("func", "Deliver")
 	l.Debugf("performing POST to %s", to.String())
 	return t.sigTransport.Deliver(ctx, b, to)
 }
diff --git a/internal/transport/dereference.go b/internal/transport/dereference.go
index 85fa370ee..477440a77 100644
--- a/internal/transport/dereference.go
+++ b/internal/transport/dereference.go
@@ -20,11 +20,12 @@ package transport
 
 import (
 	"context"
+	"github.com/sirupsen/logrus"
 	"net/url"
 )
 
 func (t *transport) Dereference(ctx context.Context, iri *url.URL) ([]byte, error) {
-	l := t.log.WithField("func", "Dereference")
+	l := logrus.WithField("func", "Dereference")
 	l.Debugf("performing GET to %s", iri.String())
 	return t.sigTransport.Dereference(ctx, iri)
 }
diff --git a/internal/transport/derefinstance.go b/internal/transport/derefinstance.go
index 673881b05..a2610f54a 100644
--- a/internal/transport/derefinstance.go
+++ b/internal/transport/derefinstance.go
@@ -23,6 +23,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/sirupsen/logrus"
 	"io/ioutil"
 	"net/http"
 	"net/url"
@@ -36,7 +37,7 @@ import (
 )
 
 func (t *transport) DereferenceInstance(ctx context.Context, iri *url.URL) (*gtsmodel.Instance, error) {
-	l := t.log.WithField("func", "DereferenceInstance")
+	l := logrus.WithField("func", "DereferenceInstance")
 
 	var i *gtsmodel.Instance
 	var err error
@@ -78,7 +79,7 @@ func (t *transport) DereferenceInstance(ctx context.Context, iri *url.URL) (*gts
 }
 
 func dereferenceByAPIV1Instance(ctx context.Context, t *transport, iri *url.URL) (*gtsmodel.Instance, error) {
-	l := t.log.WithField("func", "dereferenceByAPIV1Instance")
+	l := logrus.WithField("func", "dereferenceByAPIV1Instance")
 
 	cleanIRI := &url.URL{
 		Scheme: iri.Scheme,
@@ -235,7 +236,7 @@ func dereferenceByNodeInfo(c context.Context, t *transport, iri *url.URL) (*gtsm
 }
 
 func callNodeInfoWellKnown(ctx context.Context, t *transport, iri *url.URL) (*url.URL, error) {
-	l := t.log.WithField("func", "callNodeInfoWellKnown")
+	l := logrus.WithField("func", "callNodeInfoWellKnown")
 
 	cleanIRI := &url.URL{
 		Scheme: iri.Scheme,
@@ -300,7 +301,7 @@ func callNodeInfoWellKnown(ctx context.Context, t *transport, iri *url.URL) (*ur
 }
 
 func callNodeInfo(ctx context.Context, t *transport, iri *url.URL) (*apimodel.Nodeinfo, error) {
-	l := t.log.WithField("func", "callNodeInfo")
+	l := logrus.WithField("func", "callNodeInfo")
 
 	l.Debugf("performing GET to %s", iri.String())
 	req, err := http.NewRequestWithContext(ctx, "GET", iri.String(), nil)
diff --git a/internal/transport/derefmedia.go b/internal/transport/derefmedia.go
index e265bfdd4..e1b6df15d 100644
--- a/internal/transport/derefmedia.go
+++ b/internal/transport/derefmedia.go
@@ -21,13 +21,14 @@ package transport
 import (
 	"context"
 	"fmt"
+	"github.com/sirupsen/logrus"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 )
 
 func (t *transport) DereferenceMedia(ctx context.Context, iri *url.URL, expectedContentType string) ([]byte, error) {
-	l := t.log.WithField("func", "DereferenceMedia")
+	l := logrus.WithField("func", "DereferenceMedia")
 	l.Debugf("performing GET to %s", iri.String())
 	req, err := http.NewRequestWithContext(ctx, "GET", iri.String(), nil)
 	if err != nil {
diff --git a/internal/transport/finger.go b/internal/transport/finger.go
index ce092e83f..648db0194 100644
--- a/internal/transport/finger.go
+++ b/internal/transport/finger.go
@@ -21,13 +21,14 @@ package transport
 import (
 	"context"
 	"fmt"
+	"github.com/sirupsen/logrus"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 )
 
 func (t *transport) Finger(ctx context.Context, targetUsername string, targetDomain string) ([]byte, error) {
-	l := t.log.WithField("func", "Finger")
+	l := logrus.WithField("func", "Finger")
 	urlString := fmt.Sprintf("https://%s/.well-known/webfinger?resource=acct:%s@%s", targetDomain, targetUsername, targetDomain)
 	l.Debugf("performing GET to %s", urlString)
 
diff --git a/internal/transport/transport.go b/internal/transport/transport.go
index 8d8262834..14787f5a2 100644
--- a/internal/transport/transport.go
+++ b/internal/transport/transport.go
@@ -26,7 +26,6 @@ import (
 
 	"github.com/go-fed/activity/pub"
 	"github.com/go-fed/httpsig"
-	"github.com/sirupsen/logrus"
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
 )
 
@@ -53,5 +52,4 @@ type transport struct {
 	sigTransport *pub.HttpSigTransport
 	getSigner    httpsig.Signer
 	getSignerMu  *sync.Mutex
-	log          *logrus.Logger
 }