diff options
| -rw-r--r-- | changes/feature_3409-make-imap-poll-configurable | 2 | ||||
| -rw-r--r-- | pkg/requirements.pip | 3 | ||||
| -rw-r--r-- | src/leap/bitmask/crypto/srpauth.py | 12 | ||||
| -rw-r--r-- | src/leap/bitmask/services/mail/imap.py | 29 |
4 files changed, 37 insertions, 9 deletions
diff --git a/changes/feature_3409-make-imap-poll-configurable b/changes/feature_3409-make-imap-poll-configurable new file mode 100644 index 00000000..8730b5ab --- /dev/null +++ b/changes/feature_3409-make-imap-poll-configurable @@ -0,0 +1,2 @@ + o Make mail fetch interval in imap service configurable via environment + variable. Closes: #3409 diff --git a/pkg/requirements.pip b/pkg/requirements.pip index b77bb605..fe599f50 100644 --- a/pkg/requirements.pip +++ b/pkg/requirements.pip @@ -21,8 +21,5 @@ leap.common>=0.3.0 leap.soledad.client>=0.3.0 leap.keymanager>=0.2.0 -# Remove this when nickserver is online -mock - # Remove this when u1db fixes its dependency on oauth oauth diff --git a/src/leap/bitmask/crypto/srpauth.py b/src/leap/bitmask/crypto/srpauth.py index b3a305f1..55fff82b 100644 --- a/src/leap/bitmask/crypto/srpauth.py +++ b/src/leap/bitmask/crypto/srpauth.py @@ -495,12 +495,12 @@ class SRPAuth(QtCore.QObject): except Exception as e: logger.warning("Something went wrong with the logout: %r" % (e,)) - - self.set_session_id(None) - self.set_uid(None) - # Also reset the session - self._session = self._fetcher.session() - logger.debug("Successfully logged out.") + else: + self.set_session_id(None) + self.set_uid(None) + # Also reset the session + self._session = self._fetcher.session() + logger.debug("Successfully logged out.") def set_session_id(self, session_id): QtCore.QMutexLocker(self._session_id_lock) diff --git a/src/leap/bitmask/services/mail/imap.py b/src/leap/bitmask/services/mail/imap.py index cf93c60e..4828180e 100644 --- a/src/leap/bitmask/services/mail/imap.py +++ b/src/leap/bitmask/services/mail/imap.py @@ -18,6 +18,7 @@ Initialization of imap service """ import logging +import os #import sys from leap.mail.imap.service import imap @@ -25,6 +26,30 @@ from leap.mail.imap.service import imap logger = logging.getLogger(__name__) +# The name of the environment variable that has to be +# set to override the default time value, in seconds. +INCOMING_CHECK_PERIOD_ENV = "BITMASK_MAILCHECK_PERIOD" + + +def get_mail_check_period(): + """ + Tries to get the value of the environment variable for + overriding the period for incoming mail fetch. + """ + period = None + period_str = os.environ.get(INCOMING_CHECK_PERIOD_ENV, None) + try: + period = int(period_str) + except (ValueError, TypeError): + logger.warning("BAD value found for %s: %s" % ( + INCOMING_CHECK_PERIOD_ENV, + period_str)) + except Exception as exc: + logger.warning("Unhandled error while getting %s: %r" % ( + INCOMING_CHECK_PERIOD_ENV, + exc)) + return period + def start_imap_service(*args, **kwargs): """ @@ -34,6 +59,10 @@ def start_imap_service(*args, **kwargs): """ logger.debug('Launching imap service') + override_period = get_mail_check_period() + if override_period: + kwargs['check_period'] = override_period + # Uncomment the next two lines to get a separate debugging log # TODO handle this by a separate flag. #log.startLogging(open('/tmp/leap-imap.log', 'w')) |