diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2015-10-06 14:44:39 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2015-10-07 12:05:30 -0300 |
| commit | b8fdfc87c4a5cd0e05f35f660b61e77b1a9559a0 (patch) | |
| tree | b8066625677410ff812ae67a84fec2a0f69abc7d /src/leap/bitmask | |
| parent | a1d6d06ec05ad3e2fb8f8b43fb693d2e1b4c75be (diff) | |
[bug] pass on standalone flag to common
- Related: #7512
Diffstat (limited to 'src/leap/bitmask')
| -rw-r--r-- | src/leap/bitmask/app.py | 4 | ||||
| -rw-r--r-- | src/leap/bitmask/backend_app.py | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/leap/bitmask/app.py b/src/leap/bitmask/app.py index c9c02b59..a1b7481a 100644 --- a/src/leap/bitmask/app.py +++ b/src/leap/bitmask/app.py @@ -63,6 +63,8 @@ from leap.bitmask.services.mail import plumber from leap.bitmask.util import leap_argparse, flags_to_dict, here from leap.bitmask.util.requirement_checker import check_requirements +from leap.common.config import flags as common_flags + from leap.mail import __version__ as MAIL_VERSION import codecs @@ -172,6 +174,8 @@ def start_app(): flags.DEBUG = opts.debug + common_flags.STANDALONE = flags.STANDALONE + logger = get_logger(perform_rollover=True) # NOTE: since we are not using this right now, the code that replaces the diff --git a/src/leap/bitmask/backend_app.py b/src/leap/bitmask/backend_app.py index fb1f4400..76276e92 100644 --- a/src/leap/bitmask/backend_app.py +++ b/src/leap/bitmask/backend_app.py @@ -22,6 +22,7 @@ import signal from twisted.internet import reactor +from leap.common.config import flags as common_flags from leap.common.events import server as event_server from leap.bitmask.backend.leapbackend import LeapBackend @@ -70,6 +71,8 @@ def run_backend(bypass_checks=False, flags_dict=None, frontend_pid=None): if flags_dict is not None: dict_to_flags(flags_dict) + common_flags.STANDALONE = flags.STANDALONE + # NOTE: this needs to be used here, within the call since this function is # executed in a different process and it seems that the process/thread # identification isn't working 100% |