diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-11-26 17:53:57 +0000 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2019-11-26 17:53:57 +0000 |
| commit | 9e937c28ee2013d01716a4647ddb8df34c7ec3cd (patch) | |
| tree | ddb7c3a62227bfa760b9c9c8fcd78359f4bc4636 /synapse/handlers/pagination.py | |
| parent | Don't restrict the tests to v1 rooms (diff) | |
| parent | Merge pull request #6420 from matrix-org/erikj/fix_find_next_generated_user_i... (diff) | |
| download | synapse-9e937c28ee2013d01716a4647ddb8df34c7ec3cd.tar.xz | |
Merge branch 'develop' into babolivier/message_retention
Diffstat (limited to 'synapse/handlers/pagination.py')
| -rw-r--r-- | synapse/handlers/pagination.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/handlers/pagination.py b/synapse/handlers/pagination.py index d122c11a4d..8514ddc600 100644 --- a/synapse/handlers/pagination.py +++ b/synapse/handlers/pagination.py @@ -233,7 +233,9 @@ class PaginationHandler(object): self._purges_in_progress_by_room.add(room_id) try: with (yield self.pagination_lock.write(room_id)): - yield self.store.purge_history(room_id, token, delete_local_events) + yield self.storage.purge_events.purge_history( + room_id, token, delete_local_events + ) logger.info("[purge] complete") self._purges_by_id[purge_id].status = PurgeStatus.STATUS_COMPLETE except Exception: @@ -276,7 +278,7 @@ class PaginationHandler(object): if joined: raise SynapseError(400, "Users are still joined to this room") - await self.store.purge_room(room_id) + await self.storage.purge_events.purge_room(room_id) @defer.inlineCallbacks def get_messages( |