diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2015-03-09 11:38:17 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2015-03-09 11:38:17 -0300 |
| commit | d67402521a1feb04fa3cf25154ff5704f2fe0bc7 (patch) | |
| tree | 8223e5b2ec012329264b429176cab1f8c5bad308 /src/leap/bitmask/backend_app.py | |
| parent | b5af597c9ee51a3334416b775ef1397a3bef4430 (diff) | |
| parent | f78e2d196a89c2881c1f9c72dd380033f957af1c (diff) | |
Merge branch 'release/0.8.x' into develop
Diffstat (limited to 'src/leap/bitmask/backend_app.py')
| -rw-r--r-- | src/leap/bitmask/backend_app.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/leap/bitmask/backend_app.py b/src/leap/bitmask/backend_app.py index 286b04f7..3e88a95a 100644 --- a/src/leap/bitmask/backend_app.py +++ b/src/leap/bitmask/backend_app.py @@ -23,6 +23,7 @@ import signal from leap.bitmask.backend.leapbackend import LeapBackend from leap.bitmask.backend.utils import generate_zmq_certificates +from leap.bitmask.config import flags from leap.bitmask.logs.utils import create_logger from leap.bitmask.util import dict_to_flags @@ -57,7 +58,8 @@ def run_backend(bypass_checks=False, flags_dict=None, frontend_pid=None): """ # The backend is the one who always creates the certificates. Either if it # is run separately or in a process in the same app as the frontend. - generate_zmq_certificates() + if flags.ZMQ_HAS_CURVE: + generate_zmq_certificates() # ignore SIGINT since app.py takes care of signaling SIGTERM to us. signal.signal(signal.SIGINT, signal.SIG_IGN) |