Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Fix event-purge-by-ts admin API #3363

Merged
merged 2 commits into from
Jun 7, 2018
Merged

Fix event-purge-by-ts admin API #3363

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0546715
Fix event-purge-by-ts admin API
richvdh Jun 6, 2018
f4caf3f
fix log
richvdh Jun 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions synapse/rest/client/v1/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,16 +169,12 @@ def on_POST(self, request, room_id, event_id):
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)",
Expand All @@ -189,8 +185,10 @@ def on_POST(self, request, room_id, event_id):
"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,
)
Expand Down