diff options
Diffstat (limited to 'internal/processing/fromfederator.go')
| -rw-r--r-- | internal/processing/fromfederator.go | 34 |
1 files changed, 27 insertions, 7 deletions
diff --git a/internal/processing/fromfederator.go b/internal/processing/fromfederator.go index e39a6b4e8..132b33f4c 100644 --- a/internal/processing/fromfederator.go +++ b/internal/processing/fromfederator.go @@ -24,11 +24,13 @@ import ( "fmt" "net/url" - "github.com/sirupsen/logrus" + "codeberg.org/gruf/go-kv" + "codeberg.org/gruf/go-logger/v2/level" "github.com/superseriousbusiness/gotosocial/internal/ap" "github.com/superseriousbusiness/gotosocial/internal/federation/dereferencing" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" "github.com/superseriousbusiness/gotosocial/internal/id" + "github.com/superseriousbusiness/gotosocial/internal/log" "github.com/superseriousbusiness/gotosocial/internal/messages" ) @@ -36,12 +38,30 @@ import ( // and directs the message into the appropriate side effect handler function, or simply does nothing if there's // no handler function defined for the combination of Activity and Object. func (p *processor) ProcessFromFederator(ctx context.Context, federatorMsg messages.FromFederator) error { - l := logrus.WithFields(logrus.Fields{ - "func": "processFromFederator", - "APActivityType": federatorMsg.APActivityType, - "APObjectType": federatorMsg.APObjectType, - }) - l.Trace("processing message from federator") + // Allocate new log fields slice + fields := make([]kv.Field, 3, 5) + fields[0] = kv.Field{"activityType", federatorMsg.APActivityType} + fields[1] = kv.Field{"objectType", federatorMsg.APObjectType} + fields[2] = kv.Field{"toAccount", federatorMsg.ReceivingAccount.Username} + + if federatorMsg.APIri != nil { + // An IRI was supplied, append to log + fields = append(fields, kv.Field{ + "iri", federatorMsg.APIri, + }) + } + + if federatorMsg.GTSModel != nil && + log.Level() >= level.DEBUG { + // Append converted model to log + fields = append(fields, kv.Field{ + "model", federatorMsg.GTSModel, + }) + } + + // Log this federated message + l := log.WithFields(fields...) + l.Info("processing from federator") switch federatorMsg.APActivityType { case ap.ActivityCreate: |