summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2014-08-04 16:05:28 -0300
committerdrebs <drebs@leap.se>2014-08-04 16:05:28 -0300
commit32c4ec88a0c8fab23d3685985fce0d609e12da44 (patch)
treece6bccd70ed7492517eae92856cf58c56b9ad2ef
parent5b04d2fe6ee586e9156e0eebf8d4024cc62fea92 (diff)
parentb0365dbb706af23375fd6676d2ffe4a64a824754 (diff)
Merge branch 'bug/enable-child-process-in-backend' into develop
-rw-r--r--changes/enable-child-process-in-backend1
-rw-r--r--src/leap/bitmask/app.py4
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/enable-child-process-in-backend b/changes/enable-child-process-in-backend
new file mode 100644
index 00000000..1b6f246e
--- /dev/null
+++ b/changes/enable-child-process-in-backend
@@ -0,0 +1 @@
+- Disable daemon mode when we run the backend so we can spawn child processes on it.
diff --git a/src/leap/bitmask/app.py b/src/leap/bitmask/app.py
index 37ded92a..ad886bc4 100644
--- a/src/leap/bitmask/app.py
+++ b/src/leap/bitmask/app.py
@@ -183,7 +183,9 @@ def start_app():
frontend_pid = os.getpid()
backend = lambda: run_backend(opts.danger, flags_dict, frontend_pid)
backend_process = multiprocessing.Process(target=backend, name='Backend')
- backend_process.daemon = True
+ # we don't set the 'daemon mode' since we need to start child processes in
+ # the backend
+ # backend_process.daemon = True
backend_process.start()
run_frontend(options, flags_dict, backend_pid=backend_process.pid)