diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2015-06-10 13:35:05 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2015-06-10 13:37:49 -0300 |
| commit | 8752f7f03a04ca7fa1169885adc9dbfce8bebbd4 (patch) | |
| tree | 8975b925078021f085f2995b1bf1cce507a2e0d8 | |
| parent | 01e62e35a69aa13f86a06d8839169ea69d716009 (diff) | |
[bug] don't run event server on the standalone
We don't need to run the event server on the backend if we are running
from the standalone bundle since the launcher takes care of that.
- Related: #7126
| -rw-r--r-- | changes/bug-7126_ensure-server-breaks | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/backend_app.py | 9 |
2 files changed, 8 insertions, 2 deletions
diff --git a/changes/bug-7126_ensure-server-breaks b/changes/bug-7126_ensure-server-breaks new file mode 100644 index 00000000..00785ede --- /dev/null +++ b/changes/bug-7126_ensure-server-breaks @@ -0,0 +1 @@ +- Don't run the event server on the backend for the standalone bundle since the launcher takes care of that. Closes #7126. diff --git a/src/leap/bitmask/backend_app.py b/src/leap/bitmask/backend_app.py index 5fc8d1e2..af71ba12 100644 --- a/src/leap/bitmask/backend_app.py +++ b/src/leap/bitmask/backend_app.py @@ -70,8 +70,13 @@ def run_backend(bypass_checks=False, flags_dict=None, frontend_pid=None): if flags_dict is not None: dict_to_flags(flags_dict) - # start the events server - event_server.ensure_server() + # HACK we should be able to run the ensure_server anyway but right now it + # breaks if we run it twice. + if not flags.STANDALONE: + # start the events server + # This is not needed for the standalone bundle since the launcher takes + # care of it. + event_server.ensure_server() backend = LeapBackend(bypass_checks=bypass_checks, frontend_pid=frontend_pid) |