From b553c65d1d114f2a3a4cb3282b4505838f537421 Mon Sep 17 00:00:00 2001 From: Sriram Viswanathan Date: Thu, 16 Mar 2017 17:06:50 -0300 Subject: [bug] fix errBack in _decrypt_doc in incoming mail service with @deniscostadsc --- src/leap/bitmask/mail/incoming/service.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/leap/bitmask/mail/incoming') diff --git a/src/leap/bitmask/mail/incoming/service.py b/src/leap/bitmask/mail/incoming/service.py index 2ecd587..e1dde02 100644 --- a/src/leap/bitmask/mail/incoming/service.py +++ b/src/leap/bitmask/mail/incoming/service.py @@ -337,10 +337,13 @@ class IncomingMail(Service): "1" if success else "0") return self._process_decrypted_doc(doc, decrdata) + def log_doc_id_and_raise_exception(failure): + logger.error( + '_decrypt_doc: Error decrypting document with ID %s' % doc.doc_id) + self._errback(failure) + d = self._keymanager.decrypt(doc.content[ENC_JSON_KEY], self._userid) - d.addErrback(self._errback) - d.addErrback(lambda _: logger.error( - '_decrypt_doc: Error decrypting document with ID %s' % doc.doc_id)) + d.addErrback(log_doc_id_and_raise_exception) d.addCallback(process_decrypted) d.addCallback(lambda data: (doc, data)) return d -- cgit v1.2.3