From 4c12d05d063d42171808c432bee90de67c4042b6 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Thu, 28 May 2015 19:03:24 -0400 Subject: [refactor] move hooks to account --- src/leap/mail/incoming/service.py | 1 + 1 file changed, 1 insertion(+) (limited to 'src/leap/mail/incoming') diff --git a/src/leap/mail/incoming/service.py b/src/leap/mail/incoming/service.py index be37396..23aff3d 100644 --- a/src/leap/mail/incoming/service.py +++ b/src/leap/mail/incoming/service.py @@ -246,6 +246,7 @@ class IncomingMail(Service): :returns: doclist :rtype: iterable """ + # FIXME WTF len(doclist) is 69? doclist = first(doclist) # gatherResults pass us a list if doclist: fetched_ts = time.mktime(time.gmtime()) -- cgit v1.2.3 From 9f31b26909a62d5d76e06b51e1c7204778b1882d Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Thu, 4 Jun 2015 20:08:46 -0400 Subject: [refactor] deprecate old incoming index --- src/leap/mail/incoming/service.py | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'src/leap/mail/incoming') diff --git a/src/leap/mail/incoming/service.py b/src/leap/mail/incoming/service.py index 23aff3d..71edf08 100644 --- a/src/leap/mail/incoming/service.py +++ b/src/leap/mail/incoming/service.py @@ -161,21 +161,15 @@ class IncomingMail(Service): Calls a deferred that will execute the fetch callback in a separate thread """ - def mail_compat(failure): - if failure.check(u1db_errors.InvalidGlobbing): - # It looks like we are a dealing with an outdated - # mx. Fallback to the version of the index - warnings.warn("JUST_MAIL_COMPAT_IDX will be deprecated!", - DeprecationWarning) - return self._soledad.get_from_index( - fields.JUST_MAIL_COMPAT_IDX, "*") - return failure + def _sync_errback(failure): + failure.printTraceback() def syncSoledadCallback(_): + # XXX this should be moved to adaptors d = self._soledad.get_from_index( - fields.JUST_MAIL_IDX, "*", "0") - d.addErrback(mail_compat) + fields.JUST_MAIL_IDX, "1", "0") d.addCallback(self._process_doclist) + d.addErrback(_sync_errback) return d logger.debug("fetching mail for: %s %s" % ( -- cgit v1.2.3 From a94677b94326ffa2900141092c70d9559e01853a Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Tue, 9 Jun 2015 11:32:33 -0400 Subject: [refactor] log failure properly --- src/leap/mail/incoming/service.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/leap/mail/incoming') diff --git a/src/leap/mail/incoming/service.py b/src/leap/mail/incoming/service.py index 71edf08..4738dd4 100644 --- a/src/leap/mail/incoming/service.py +++ b/src/leap/mail/incoming/service.py @@ -162,7 +162,7 @@ class IncomingMail(Service): in a separate thread """ def _sync_errback(failure): - failure.printTraceback() + log.err(failure) def syncSoledadCallback(_): # XXX this should be moved to adaptors @@ -206,8 +206,7 @@ class IncomingMail(Service): # synchronize incoming mail def _errback(self, failure): - logger.exception(failure.value) - traceback.print_exc() + log.err(failure) def _sync_soledad(self): """ -- cgit v1.2.3 From 03cc09d35c880a5805ac9bdbad4a8b6ebe8e717f Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Tue, 9 Jun 2015 11:32:41 -0400 Subject: [bug] pass the doclist to the ui signal before, we were taking the length of a string, signalling an incorrect number to the ui. currently this event is not being used, just only logged. in the future the ui could probably might want to make use of this info to keep record of a separate counter (how many mails received in the last sync). --- src/leap/mail/incoming/service.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/leap/mail/incoming') diff --git a/src/leap/mail/incoming/service.py b/src/leap/mail/incoming/service.py index 4738dd4..3daf86b 100644 --- a/src/leap/mail/incoming/service.py +++ b/src/leap/mail/incoming/service.py @@ -239,8 +239,6 @@ class IncomingMail(Service): :returns: doclist :rtype: iterable """ - # FIXME WTF len(doclist) is 69? - doclist = first(doclist) # gatherResults pass us a list if doclist: fetched_ts = time.mktime(time.gmtime()) num_mails = len(doclist) if doclist is not None else 0 @@ -299,7 +297,9 @@ class IncomingMail(Service): d.addCallback(self._extract_keys) d.addCallbacks(self._add_message_locally, self._errback) deferreds.append(d) - return defer.gatherResults(deferreds, consumeErrors=True) + d = defer.gatherResults(deferreds, consumeErrors=True) + d.addCallback(lambda _: doclist) + return d # # operations on individual messages -- cgit v1.2.3