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

Prefix subjects, preserve inboxes

Browse source
This commit is contained in:
Neil Alexander 2022-03-22 14:35:56 +00:00
parent 4d636428c0
commit 1170030352
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
roomserver/internal/input/input.go
View file

@ -66,6 +66,7 @@ type Inputer struct {
type worker struct {
phony.Inbox
sync.Mutex
r *Inputer
roomID string
subscription *nats.Subscription
@ -77,9 +78,11 @@ func (r *Inputer) startWorkerForRoom(roomID string) {
roomID: roomID,
})
w := v.(*worker)
if !loaded {
w.Lock()
defer w.Lock()
if !loaded || w.subscription == nil {
consumer := r.Cfg.Matrix.JetStream.Prefixed("RoomInput" + jetstream.Tokenise(w.roomID))
subject := jetstream.InputRoomEventSubj(w.roomID)
subject := r.Cfg.Matrix.JetStream.Prefixed(jetstream.InputRoomEventSubj(w.roomID))
if _, err := w.r.JetStream.AddConsumer(
r.Cfg.Matrix.JetStream.Prefixed(jetstream.InputRoomEvent),
@ -143,7 +146,9 @@ func (w *worker) next() {
if err = w.subscription.Unsubscribe(); err != nil {
logrus.WithError(err).Errorf("Failed to unsubscribe to stream for room %q", w.roomID)
}
w.r.workers.Delete(w.roomID)
w.Lock()
w.subscription = nil
w.Unlock()
return
case nats.ErrTimeout:
w.Act(nil, w.next)
@ -153,7 +158,9 @@ func (w *worker) next() {
if err = w.subscription.Unsubscribe(); err != nil {
logrus.WithError(err).Errorf("Failed to unsubscribe to stream for room %q", w.roomID)
}
w.r.workers.Delete(w.roomID)
w.Lock()
w.subscription = nil
w.Unlock()
return
}
@ -214,7 +221,7 @@ func (r *Inputer) InputRoomEvents(
var err error
for _, e := range request.InputRoomEvents {
roomID := e.Event.RoomID()
subj := jetstream.InputRoomEventSubj(roomID)
subj := r.Cfg.Matrix.JetStream.Prefixed(jetstream.InputRoomEventSubj(roomID))
msg := &nats.Msg{
Subject: subj,
Header: nats.Header{},