From fd8d3cc1da5079c931a7ad897bff047509f27a40 Mon Sep 17 00:00:00 2001 From: Folker Bernitt Date: Mon, 31 Aug 2015 14:33:42 +0200 Subject: Ensure MailboxIndexerListener does not let exceptions escape. - Issue #445 --- .../adapter/listeners/mailbox_indexer_listener.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'service/pixelated/adapter/listeners') diff --git a/service/pixelated/adapter/listeners/mailbox_indexer_listener.py b/service/pixelated/adapter/listeners/mailbox_indexer_listener.py index 77a78f0e..8896d742 100644 --- a/service/pixelated/adapter/listeners/mailbox_indexer_listener.py +++ b/service/pixelated/adapter/listeners/mailbox_indexer_listener.py @@ -13,10 +13,13 @@ # # You should have received a copy of the GNU Affero General Public License # along with Pixelated. If not, see . - +import logging from twisted.internet import defer +logger = logging.getLogger(__name__) + + class MailboxIndexerListener(object): """ Listens for new mails, keeping the index updated """ @@ -38,13 +41,16 @@ class MailboxIndexerListener(object): @defer.inlineCallbacks def newMessages(self, exists, recent): - indexed_idents = set(self.SEARCH_ENGINE.search('tag:' + self.mailbox_name.lower(), all_mails=True)) - soledad_idents = yield self.mail_store.get_mailbox_mail_ids(self.mailbox_name) - soledad_idents = set(soledad_idents) + try: + indexed_idents = set(self.SEARCH_ENGINE.search('tag:' + self.mailbox_name.lower(), all_mails=True)) + soledad_idents = yield self.mail_store.get_mailbox_mail_ids(self.mailbox_name) + soledad_idents = set(soledad_idents) - missing_idents = soledad_idents.difference(indexed_idents) + missing_idents = soledad_idents.difference(indexed_idents) - self.SEARCH_ENGINE.index_mails((yield self.mail_store.get_mails(missing_idents))) + self.SEARCH_ENGINE.index_mails((yield self.mail_store.get_mails(missing_idents))) + except Exception, e: # this is a event handler, don't let exceptions escape + logger.error(e) def __eq__(self, other): return other and other.mailbox_name == self.mailbox_name -- cgit v1.2.3