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

Add rest servlet. Fix SQL.

This commit is contained in:
Erik Johnston 2016-07-06 15:56:59 +01:00
parent eef7778af9
commit 67f2c901ea
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,3 +124,4 @@ def register_servlets(hs, http_server):
WhoisRestServlet(hs).register(http_server) WhoisRestServlet(hs).register(http_server)
PurgeMediaCacheRestServlet(hs).register(http_server) PurgeMediaCacheRestServlet(hs).register(http_server)
DeactivateAccountRestServlet(hs).register(http_server) DeactivateAccountRestServlet(hs).register(http_server)
PurgeHistoryRestServlet(hs).register(http_server)

9
synapse/storage/events.py
View File

@ -1384,10 +1384,6 @@ class EventsStore(SQLBaseStore):
(event_id,) for event_id, state_key in event_rows (event_id,) for event_id, state_key in event_rows
if state_key is None and not self.hs.is_mine_id(event_id) 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 ( for table in (
"events", "events",
"event_json", "event_json",
@ -1424,7 +1420,10 @@ class EventsStore(SQLBaseStore):
txn.executemany( txn.executemany(
"UPDATE events SET outlier = ?" "UPDATE events SET outlier = ?"
" WHERE event_id = ?", " 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)
]
) )