diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-06-07 11:34:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-07 11:34:46 +0100 |
| commit | 1152f495a074455312944820ae7c30c53720722c (patch) | |
| tree | c234b07a2bea9754ea2dee09fbd6f3bccb83420d /synapse/rest/client/v1/admin.py | |
| parent | Merge pull request #3355 from matrix-org/rav/fix_federation_backfill (diff) | |
| parent | fix log (diff) | |
| download | synapse-1152f495a074455312944820ae7c30c53720722c.tar.xz | |
Merge pull request #3363 from matrix-org/rav/fix_purge
Fix event-purge-by-ts admin API
Diffstat (limited to 'synapse/rest/client/v1/admin.py')
| -rw-r--r-- | synapse/rest/client/v1/admin.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/synapse/rest/client/v1/admin.py b/synapse/rest/client/v1/admin.py index 6835a7bba2..b8665a45eb 100644 --- a/synapse/rest/client/v1/admin.py +++ b/synapse/rest/client/v1/admin.py @@ -169,16 +169,12 @@ class PurgeHistoryRestServlet(ClientV1RestServlet): yield self.store.find_first_stream_ordering_after_ts(ts) ) - room_event_after_stream_ordering = ( + r = ( yield self.store.get_room_event_after_stream_ordering( room_id, stream_ordering, ) ) - if room_event_after_stream_ordering: - token = yield self.store.get_topological_token_for_event( - room_event_after_stream_ordering, - ) - else: + if not r: logger.warn( "[purge] purging events not possible: No event found " "(received_ts %i => stream_ordering %i)", @@ -189,8 +185,10 @@ class PurgeHistoryRestServlet(ClientV1RestServlet): "there is no event to be purged", errcode=Codes.NOT_FOUND, ) + (stream, topo, _event_id) = r + token = "t%d-%d" % (topo, stream) logger.info( - "[purge] purging up to token %d (received_ts %i => " + "[purge] purging up to token %s (received_ts %i => " "stream_ordering %i)", token, ts, stream_ordering, ) |