summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/leap/bitmask/logs/utils.py2
-rw-r--r--src/leap/bitmask/services/mail/emailfirewall.py5
-rw-r--r--src/leap/bitmask/services/soledad/soledadbootstrapper.py6
3 files changed, 10 insertions, 3 deletions
diff --git a/src/leap/bitmask/logs/utils.py b/src/leap/bitmask/logs/utils.py
index f709da8b..e38839c7 100644
--- a/src/leap/bitmask/logs/utils.py
+++ b/src/leap/bitmask/logs/utils.py
@@ -55,7 +55,7 @@ def get_logger(perform_rollover=False):
level = logbook.NOTSET
# This handler consumes logs not handled by the others
- null_handler = logbook.NullHandler(bubble=False)
+ null_handler = logbook.NullHandler()
null_handler.push_application()
silencer = SelectiveSilencerFilter()
diff --git a/src/leap/bitmask/services/mail/emailfirewall.py b/src/leap/bitmask/services/mail/emailfirewall.py
index 2cd2ec31..f7b5d7a2 100644
--- a/src/leap/bitmask/services/mail/emailfirewall.py
+++ b/src/leap/bitmask/services/mail/emailfirewall.py
@@ -34,6 +34,11 @@ def get_email_firewall():
"""
Return the email firewall handler for the current platform.
"""
+ # disable email firewall on a docker container so we can access from an
+ # external MUA
+ if os.environ.get("LEAP_DOCKERIZED"):
+ return None
+
if not (IS_LINUX):
error_msg = "Email firewall not implemented for this platform."
raise NotImplementedError(error_msg)
diff --git a/src/leap/bitmask/services/soledad/soledadbootstrapper.py b/src/leap/bitmask/services/soledad/soledadbootstrapper.py
index 57ae3849..f3d50925 100644
--- a/src/leap/bitmask/services/soledad/soledadbootstrapper.py
+++ b/src/leap/bitmask/services/soledad/soledadbootstrapper.py
@@ -253,6 +253,7 @@ class SoledadBootstrapper(AbstractBootstrapper):
logger.warning(msg)
continue
+ self._signaler.signal(self._signaler.soledad_bootstrap_failed)
logger.exception(exc)
raise SoledadInitError()
@@ -622,10 +623,10 @@ class Syncer(object):
logger.debug("BOOTSTRAPPER: trying to sync Soledad....")
# pass defer_decryption=False to get inline decryption
# for debugging.
- self._sync_deferred = self._soledad.sync(defer_decryption=True)
- self._sync_deferred.addCallbacks(self._success, self._error)
self._timeout_delayed_call = reactor.callLater(self.WAIT_MAX_SECONDS,
self._timeout)
+ self._sync_deferred = self._soledad.sync(defer_decryption=True)
+ self._sync_deferred.addCallbacks(self._success, self._error)
def _success(self, result):
logger.debug("Soledad has been synced!")
@@ -668,5 +669,6 @@ class Syncer(object):
self._try_sync()
else:
logger.error("Sync failed {0} times".format(self._tries))
+ self._signaler.signal(self._signaler.soledad_bootstrap_failed)
self._callback_deferred.errback(
SoledadSyncError("Too many retries"))