diff options
| author |  R. Aidan Campbell <raidancampbell@users.noreply.github.com> | 2021-10-11 05:37:33 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2021-10-11 14:37:33 +0200 |
| commit | 083099a9575f8b2fac22c1d4a51a9dd0e2201243 (patch) | |
| tree | d1787aa544679c433f797d2313ce532250fe574f /internal/federation/federatingdb/create.go | |
| parent | Handle forwarded messages (#273) (diff) | |
| download | gotosocial-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/federation/federatingdb/create.go')
| -rw-r--r-- | internal/federation/federatingdb/create.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/internal/federation/federatingdb/create.go b/internal/federation/federatingdb/create.go index 4262dfcb4..862f84473 100644 --- a/internal/federation/federatingdb/create.go +++ b/internal/federation/federatingdb/create.go @@ -46,13 +46,13 @@ import ( // Under certain conditions and network activities, Create may be called // multiple times for the same ActivityStreams object. func (f *federatingDB) Create(ctx context.Context, asType vocab.Type) error { - l := f.log.WithFields( + l := logrus.WithFields( logrus.Fields{ "func": "Create", }, ) - if f.log.Level >= logrus.DebugLevel { + if logrus.GetLevel() >= logrus.DebugLevel { i, err := marshalItem(asType) if err != nil { return err @@ -169,7 +169,7 @@ func (f *federatingDB) activityCreate(ctx context.Context, asType vocab.Type, re // createNote handles a Create activity with a Note type. func (f *federatingDB) createNote(ctx context.Context, note vocab.ActivityStreamsNote, receivingAccount *gtsmodel.Account, requestingAccount *gtsmodel.Account, fromFederatorChan chan messages.FromFederator) error { - l := f.log.WithFields(logrus.Fields{ + l := logrus.WithFields(logrus.Fields{ "func": "createNote", "receivingAccount": receivingAccount.URI, "requestingAccount": requestingAccount.URI, |