diff options
| author | Erik Johnston <erik@matrix.org> | 2016-07-06 15:56:59 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-07-06 15:56:59 +0100 |
| commit | 67f2c901ea4196d869380c1c5cdd8569934857ed (patch) | |
| tree | e0a7c1778a0fa12864e5eff53095f01b6b639931 | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/test2 (diff) | |
| download | synapse-67f2c901ea4196d869380c1c5cdd8569934857ed.tar.xz | |
Add rest servlet. Fix SQL.
Diffstat (limited to '')
| -rw-r--r-- | synapse/rest/client/v1/admin.py | 1 | ||||
| -rw-r--r-- | synapse/storage/events.py | 9 |
2 files changed, 5 insertions, 5 deletions
diff --git a/synapse/rest/client/v1/admin.py b/synapse/rest/client/v1/admin.py index 71537a7d0b..b0cb31a448 100644 --- a/synapse/rest/client/v1/admin.py +++ b/synapse/rest/client/v1/admin.py @@ -124,3 +124,4 @@ def register_servlets(hs, http_server): WhoisRestServlet(hs).register(http_server) PurgeMediaCacheRestServlet(hs).register(http_server) DeactivateAccountRestServlet(hs).register(http_server) + PurgeHistoryRestServlet(hs).register(http_server) diff --git a/synapse/storage/events.py b/synapse/storage/events.py index c3b498bb3d..23ebd5d4c5 100644 --- a/synapse/storage/events.py +++ b/synapse/storage/events.py @@ -1384,10 +1384,6 @@ class EventsStore(SQLBaseStore): (event_id,) for event_id, state_key in event_rows if state_key is None and not self.hs.is_mine_id(event_id) ] - to_not_delete = [ - (event_id,) for event_id, state_key in event_rows - if state_key is not None or self.hs.is_mine_id(event_id) - ] for table in ( "events", "event_json", @@ -1424,7 +1420,10 @@ class EventsStore(SQLBaseStore): txn.executemany( "UPDATE events SET outlier = ?" " WHERE event_id = ?", - to_not_delete + [ + (True, event_id,) for event_id, state_key in event_rows + if state_key is not None or self.hs.is_mine_id(event_id) + ] ) |