1 files changed, 6 insertions, 5 deletions
diff --git a/synapse/handlers/appservice.py b/synapse/handlers/appservice.py
index 814553e098..203b62e015 100644
--- a/synapse/handlers/appservice.py
+++ b/synapse/handlers/appservice.py
@@ -104,14 +104,15 @@ class ApplicationServicesHandler:
with Measure(self.clock, "notify_interested_services"):
self.is_processing = True
try:
- limit = 100
upper_bound = -1
while upper_bound < self.current_max:
+ last_token = await self.store.get_appservice_last_pos()
(
upper_bound,
events,
- ) = await self.store.get_new_events_for_appservice(
- self.current_max, limit
+ event_to_received_ts,
+ ) = await self.store.get_all_new_events_stream(
+ last_token, self.current_max, limit=100, get_prev_content=True
)
events_by_room: Dict[str, List[EventBase]] = {}
@@ -150,7 +151,7 @@ class ApplicationServicesHandler:
)
now = self.clock.time_msec()
- ts = await self.store.get_received_ts(event.event_id)
+ ts = event_to_received_ts[event.event_id]
assert ts is not None
synapse.metrics.event_processing_lag_by_event.labels(
@@ -187,7 +188,7 @@ class ApplicationServicesHandler:
if events:
now = self.clock.time_msec()
- ts = await self.store.get_received_ts(events[-1].event_id)
+ ts = event_to_received_ts[events[-1].event_id]
assert ts is not None
synapse.metrics.event_processing_lag.labels(
|
