mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-03-03 17:03:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Tweak consumer behaviour

Browse source
This commit is contained in:
Neil Alexander 2022-08-31 16:45:07 +01:00
parent 19bdcd9c06
commit 514ab4bd59
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
setup/jetstream/helpers.go
View file

@ -3,7 +3,6 @@ package jetstream
import ( import (
"context" "context"
"fmt" "fmt"
"time"
"github.com/getsentry/sentry-go" "github.com/getsentry/sentry-go"
"github.com/nats-io/nats.go" "github.com/nats-io/nats.go"
@ -90,24 +89,28 @@ func JetStreamConsumer(
if len(msgs) < 1 { if len(msgs) < 1 {
continue continue
} }
msg := msgs[len(msgs)-1] // most recent message, in case of AckAll for _, msg := range msgs {
if err = msg.InProgress(nats.Context(ctx)); err != nil { if err = msg.InProgress(nats.Context(ctx)); err != nil {
logrus.WithContext(ctx).WithField("subject", subj).Warn(fmt.Errorf("msg.InProgress: %w", err)) logrus.WithContext(ctx).WithField("subject", subj).Warn(fmt.Errorf("msg.InProgress: %w", err))
sentry.CaptureException(err) sentry.CaptureException(err)
continue continue
} }
}
if f(ctx, msgs) { if f(ctx, msgs) {
msg := msgs[len(msgs)-1] // most recent message, in case of AckAll
if err = msg.AckSync(nats.Context(ctx)); err != nil { if err = msg.AckSync(nats.Context(ctx)); err != nil {
logrus.WithContext(ctx).WithField("subject", subj).Warn(fmt.Errorf("msg.AckSync: %w", err)) logrus.WithContext(ctx).WithField("subject", subj).Warn(fmt.Errorf("msg.AckSync: %w", err))
sentry.CaptureException(err) sentry.CaptureException(err)
} }
} else { } else {
if err = msg.NakWithDelay(time.Second*15, nats.Context(ctx)); err != nil { for _, msg := range msgs {
if err = msg.Nak(nats.Context(ctx)); err != nil {
logrus.WithContext(ctx).WithField("subject", subj).Warn(fmt.Errorf("msg.Nak: %w", err)) logrus.WithContext(ctx).WithField("subject", subj).Warn(fmt.Errorf("msg.Nak: %w", err))
sentry.CaptureException(err) sentry.CaptureException(err)
} }
} }
} }
}
}() }()
return nil return nil
} }