From 0aa91059a926ca890a049e8b48a169d5943fe0f9 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Thu, 7 Jan 2021 17:21:07 +0000 Subject: [PATCH] Tweaks --- syncapi/consumers/keychange.go | 3 --- syncapi/consumers/roomserver.go | 22 +++++++++++----------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/syncapi/consumers/keychange.go b/syncapi/consumers/keychange.go index 9f58051e8..75b2ba721 100644 --- a/syncapi/consumers/keychange.go +++ b/syncapi/consumers/keychange.go @@ -121,8 +121,5 @@ func (s *OutputKeyChangeEventConsumer) onMessage(msg *sarama.ConsumerMessage) er s.streams.DeviceListStreamProvider.Advance(posUpdate) - //for userID := range queryRes.UserIDsToCount { - // s.notifier.OnNewKeyChange(posUpdate, userID, output.UserID) - //} return nil } diff --git a/syncapi/consumers/roomserver.go b/syncapi/consumers/roomserver.go index 9de359dd2..ac63f0b0c 100644 --- a/syncapi/consumers/roomserver.go +++ b/syncapi/consumers/roomserver.go @@ -292,9 +292,9 @@ func (s *OutputRoomEventConsumer) onRetireInviteEvent( }).Panicf("roomserver output log: remove invite failure") return nil } + // Notify any active sync requests that the invite has been retired. // Invites share the same stream counter as PDUs - s.streams.InviteStreamProvider.Advance(pduPos) return nil @@ -311,12 +311,12 @@ func (s *OutputRoomEventConsumer) onNewPeek( }).Panicf("roomserver output log: write peek failure") return nil } + // tell the notifier about the new peek so it knows to wake up new devices - //s.notifier.OnNewPeek(msg.RoomID, msg.UserID, msg.DeviceID) - _ = sp - // we need to wake up the users who might need to now be peeking into this room, - // so we send in a dummy event to trigger a wakeup - //s.notifier.OnNewEvent(nil, msg.RoomID, nil, types.StreamingToken{PDUPosition: sp}) + // TODO: This only works because the peeks table is reusing the same + // index as PDUs, but we should fix this + s.streams.PDUStreamProvider.Advance(sp) + return nil } @@ -331,12 +331,12 @@ func (s *OutputRoomEventConsumer) onRetirePeek( }).Panicf("roomserver output log: write peek failure") return nil } + // tell the notifier about the new peek so it knows to wake up new devices - //s.notifier.OnRetirePeek(msg.RoomID, msg.UserID, msg.DeviceID) - _ = sp - // we need to wake up the users who might need to now be peeking into this room, - // so we send in a dummy event to trigger a wakeup - //s.notifier.OnNewEvent(nil, msg.RoomID, nil, types.StreamingToken{PDUPosition: sp}) + // TODO: This only works because the peeks table is reusing the same + // index as PDUs, but we should fix this + s.streams.PDUStreamProvider.Advance(sp) + return nil }