Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3363 from matrix-org/rav/fix_purge 

Fix event-purge-by-ts admin API
This commit is contained in:
Richard van der Hoff 2018-06-07 11:34:46 +01:00 committed by GitHub
parent e2acf536d4 f4caf3f83d
commit 1152f495a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
synapse/rest/client/v1/admin.py
View File

@ -169,16 +169,12 @@ class PurgeHistoryRestServlet(ClientV1RestServlet):
yield self.store.find_first_stream_ordering_after_ts(ts) 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( yield self.store.get_room_event_after_stream_ordering(
room_id, stream_ordering, room_id, stream_ordering,
) )
) )
if room_event_after_stream_ordering: if not r:
token = yield self.store.get_topological_token_for_event(
room_event_after_stream_ordering,
)
else:
logger.warn( logger.warn(
"[purge] purging events not possible: No event found " "[purge] purging events not possible: No event found "
"(received_ts %i => stream_ordering %i)", "(received_ts %i => stream_ordering %i)",
@ -189,8 +185,10 @@ class PurgeHistoryRestServlet(ClientV1RestServlet):
"there is no event to be purged", "there is no event to be purged",
errcode=Codes.NOT_FOUND, errcode=Codes.NOT_FOUND,
) )
(stream, topo, _event_id) = r
token = "t%d-%d" % (topo, stream)
logger.info( logger.info(
"[purge] purging up to token %d (received_ts %i => " "[purge] purging up to token %s (received_ts %i => "
"stream_ordering %i)", "stream_ordering %i)",
token, ts, stream_ordering, token, ts, stream_ordering,
) )