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

Don't completely drain the list

This commit is contained in:
Erik Johnston 2015-05-15 16:34:17 +01:00
parent 8763dd80ef
commit 70f272f71c
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
synapse/storage/events.py
View File

@ -505,8 +505,15 @@ class EventsStore(SQLBaseStore):
while True: while True:
try: try:
with self._event_fetch_lock: with self._event_fetch_lock:
event_list = self._event_fetch_list tot = 0
self._event_fetch_list = [] for j, lst in enumerate(self._event_fetch_list):
if tot > 200:
break
tot += len(lst[0])
event_list = self._event_fetch_list[:j+1]
self._event_fetch_list = self._event_fetch_list[j+1:]
if not event_list: if not event_list:
if self.database_engine.single_threaded or i > 3: if self.database_engine.single_threaded or i > 3:
self._event_fetch_ongoing -= 1 self._event_fetch_ongoing -= 1