diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2015-02-19 14:12:15 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2015-02-20 14:23:05 -0300 |
| commit | 00b8cbaa31d48326b36928228269ac14276fd5ee (patch) | |
| tree | b01d1b66bc933815104ee73b1805c1ef00d17e14 /src/leap/bitmask/backend_app.py | |
| parent | ff705af455af17710bab34c7959f1c54fb963839 (diff) | |
Fall back to plain ZMQ if Curve is not available.
Use global flag for ZMQ_HAS_CURVE.
Closes #6646
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) |