tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Correctly capture Queue.Empty exception

Browse source
This commit is contained in:
Erik Johnston 2015-05-21 15:37:43 +01:00
parent 4fb858d90a
commit 115ef3ddac
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
synapse/storage/event_federation.py
View file

@ -19,7 +19,7 @@ from ._base import SQLBaseStore, cached
from syutil.base64util import encode_base64 from syutil.base64util import encode_base64
import logging import logging
from Queue import PriorityQueue from Queue import PriorityQueue, Empty
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -398,7 +398,10 @@ class EventFederationStore(SQLBaseStore):
queue.put(row) queue.put(row)
while not queue.empty() and len(event_results) < limit: while not queue.empty() and len(event_results) < limit:
_, event_id = queue.get_nowait() try:
_, event_id = queue.get_nowait()
except Empty:
break
event_results.add(event_id) event_results.add(event_id)