From 115ef3ddac9dbb1c49c31257190e77062b5a10a8 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Thu, 21 May 2015 15:37:43 +0100 Subject: [PATCH] Correctly capture Queue.Empty exception --- synapse/storage/event_federation.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/synapse/storage/event_federation.py b/synapse/storage/event_federation.py index 80eff8e6f..e171cbcdb 100644 --- a/synapse/storage/event_federation.py +++ b/synapse/storage/event_federation.py @@ -19,7 +19,7 @@ from ._base import SQLBaseStore, cached from syutil.base64util import encode_base64 import logging -from Queue import PriorityQueue +from Queue import PriorityQueue, Empty logger = logging.getLogger(__name__) @@ -398,7 +398,10 @@ class EventFederationStore(SQLBaseStore): queue.put(row) 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)