diff options
| author | Till Faelligen <2353100+S7evinK@users.noreply.github.com> | 2022-08-05 15:37:13 +0200 |
|---|---|---|
| committer | Till Faelligen <2353100+S7evinK@users.noreply.github.com> | 2022-08-05 15:37:13 +0200 |
| commit | 10a151cb55ba925c3ece2026c65cb8e57207bf46 (patch) | |
| tree | 00ca32272ab932ad83e488bec8a276fb9bdf28a5 | |
| parent | 3a156a434ac193781774c7acfd6bf1c594028f74 (diff) | |
Don't panic if we fail to upsert account data
| -rw-r--r-- | syncapi/consumers/clientapi.go | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/syncapi/consumers/clientapi.go b/syncapi/consumers/clientapi.go index eec369c1..02633b56 100644 --- a/syncapi/consumers/clientapi.go +++ b/syncapi/consumers/clientapi.go @@ -21,6 +21,11 @@ import ( "fmt" "github.com/getsentry/sentry-go" + "github.com/matrix-org/gomatrixserverlib" + "github.com/nats-io/nats.go" + "github.com/sirupsen/logrus" + log "github.com/sirupsen/logrus" + "github.com/matrix-org/dendrite/internal/eventutil" "github.com/matrix-org/dendrite/setup/config" "github.com/matrix-org/dendrite/setup/jetstream" @@ -29,10 +34,6 @@ import ( "github.com/matrix-org/dendrite/syncapi/producers" "github.com/matrix-org/dendrite/syncapi/storage" "github.com/matrix-org/dendrite/syncapi/types" - "github.com/matrix-org/gomatrixserverlib" - "github.com/nats-io/nats.go" - "github.com/sirupsen/logrus" - log "github.com/sirupsen/logrus" ) // OutputClientDataConsumer consumes events that originated in the client API server. @@ -107,7 +108,8 @@ func (s *OutputClientDataConsumer) onMessage(ctx context.Context, msg *nats.Msg) "type": output.Type, "room_id": output.RoomID, log.ErrorKey: err, - }).Panicf("could not save account data") + }).Errorf("could not save account data") + return false } if err = s.sendReadUpdate(ctx, userID, output); err != nil { |