diff options
| author | Eric Eastwood <erice@element.io> | 2022-09-14 18:14:17 -0500 |
|---|---|---|
| committer | Eric Eastwood <erice@element.io> | 2022-09-14 18:14:17 -0500 |
| commit | dab846568de09742c038a9a5a5ed00539ff5aa38 (patch) | |
| tree | ef4220faa96569d1d8d5f386c92bb4df2655eeed /synapse/streams | |
| parent | Add changelog (diff) | |
| parent | Keep track when we try and fail to process a pulled event (#13589) (diff) | |
| download | synapse-github/madlittlemods/event_id_always_failed_to_fetch.tar.xz | |
Merge branch 'develop' into madlittlemods/event_id_always_failed_to_fetch github/madlittlemods/event_id_always_failed_to_fetch madlittlemods/event_id_always_failed_to_fetch
Conflicts: synapse/handlers/federation_event.py
Diffstat (limited to 'synapse/streams')
| -rw-r--r-- | synapse/streams/events.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/streams/events.py b/synapse/streams/events.py index 54e0b1a23b..bcd840bd88 100644 --- a/synapse/streams/events.py +++ b/synapse/streams/events.py @@ -21,6 +21,7 @@ from synapse.handlers.presence import PresenceEventSource from synapse.handlers.receipts import ReceiptEventSource from synapse.handlers.room import RoomEventSource from synapse.handlers.typing import TypingNotificationEventSource +from synapse.logging.opentracing import trace from synapse.streams import EventSource from synapse.types import StreamToken @@ -69,6 +70,7 @@ class EventSources: ) return token + @trace async def get_current_token_for_pagination(self, room_id: str) -> StreamToken: """Get the current token for a given room to be used to paginate events. |