aboutsummaryrefslogtreecommitdiff
path: root/syncapi/consumers
diff options
context:
space:
mode:
authorNeil Alexander <neilalexander@users.noreply.github.com>2022-07-22 14:44:04 +0100
committerGitHub <noreply@github.com>2022-07-22 14:44:04 +0100
commitf0c8a03649ab270bb15156a3cc47cae2aee3f36a (patch)
tree61ba370970ecead0161a7ab59811d16613e233e9 /syncapi/consumers
parenta201b4400dd4fe99b4c391f94ac31884deccc12c (diff)
Membership updater refactoring (#2541)
* Membership updater refactoring * Pass in membership state * Use membership check rather than referring to state directly * Delete irrelevant membership states * We don't need the leave event after all * Tweaks * Put a log entry in that I might stand a chance of finding * Be less panicky * Tweak invite handling * Don't freak if we can't find the event NID * Use event NID from `types.Event` * Clean up * Better invite handling * Placate the almighty linter * Blacklist a Sytest which is otherwise fine under Complement for reasons I don't understand * Fix the sytest after all (thanks @S7evinK for the spot)
Diffstat (limited to 'syncapi/consumers')
-rw-r--r--syncapi/consumers/roomserver.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/syncapi/consumers/roomserver.go b/syncapi/consumers/roomserver.go
index 328e1e9d..f77b1673 100644
--- a/syncapi/consumers/roomserver.go
+++ b/syncapi/consumers/roomserver.go
@@ -365,7 +365,7 @@ func (s *OutputRoomEventConsumer) onNewInviteEvent(
"event": string(msg.Event.JSON()),
"pdupos": pduPos,
log.ErrorKey: err,
- }).Panicf("roomserver output log: write invite failure")
+ }).Errorf("roomserver output log: write invite failure")
return
}
@@ -385,7 +385,7 @@ func (s *OutputRoomEventConsumer) onRetireInviteEvent(
log.WithFields(log.Fields{
"event_id": msg.EventID,
log.ErrorKey: err,
- }).Panicf("roomserver output log: remove invite failure")
+ }).Errorf("roomserver output log: remove invite failure")
return
}
@@ -403,7 +403,7 @@ func (s *OutputRoomEventConsumer) onNewPeek(
// panic rather than continue with an inconsistent database
log.WithFields(log.Fields{
log.ErrorKey: err,
- }).Panicf("roomserver output log: write peek failure")
+ }).Errorf("roomserver output log: write peek failure")
return
}
@@ -422,7 +422,7 @@ func (s *OutputRoomEventConsumer) onRetirePeek(
// panic rather than continue with an inconsistent database
log.WithFields(log.Fields{
log.ErrorKey: err,
- }).Panicf("roomserver output log: write peek failure")
+ }).Errorf("roomserver output log: write peek failure")
return
}