diff options
| author | Erik Johnston <erik@matrix.org> | 2022-08-24 09:58:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-24 09:58:29 +0100 |
| commit | cbb157548676865793f39b4da0b7f3fa5ee01058 (patch) | |
| tree | 77ff41ddcb9b01938b4efdd109cf90981c86a23e /synapse/handlers/pagination.py | |
| parent | Newsfile (diff) | |
| parent | Instrument `_check_sigs_and_hash_and_fetch` to trace time spent in child conc... (diff) | |
| download | synapse-erikj/less_state_membership.tar.xz | |
Merge branch 'develop' into erikj/less_state_membership github/erikj/less_state_membership erikj/less_state_membership
Diffstat (limited to 'synapse/handlers/pagination.py')
| -rw-r--r-- | synapse/handlers/pagination.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/handlers/pagination.py b/synapse/handlers/pagination.py index 6262a35822..74e944bce7 100644 --- a/synapse/handlers/pagination.py +++ b/synapse/handlers/pagination.py @@ -24,6 +24,7 @@ from synapse.api.errors import SynapseError from synapse.api.filtering import Filter from synapse.events.utils import SerializeEventConfig from synapse.handlers.room import ShutdownRoomResponse +from synapse.logging.opentracing import trace from synapse.metrics.background_process_metrics import run_as_background_process from synapse.storage.state import StateFilter from synapse.streams.config import PaginationConfig @@ -416,6 +417,7 @@ class PaginationHandler: await self._storage_controllers.purge_events.purge_room(room_id) + @trace async def get_messages( self, requester: Requester, @@ -462,7 +464,7 @@ class PaginationHandler: membership, member_event_id, ) = await self.auth.check_user_in_room_or_world_readable( - room_id, user_id, allow_departed_users=True + room_id, requester, allow_departed_users=True ) if pagin_config.direction == "b": |