summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2015-06-10 13:35:05 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2015-06-10 13:37:49 -0300
commit8752f7f03a04ca7fa1169885adc9dbfce8bebbd4 (patch)
tree8975b925078021f085f2995b1bf1cce507a2e0d8 /src/leap
parent01e62e35a69aa13f86a06d8839169ea69d716009 (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
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/bitmask/backend_app.py9
1 files changed, 7 insertions, 2 deletions
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)