diff options
author | Kali Kaneko <kali@leap.se> | 2015-10-29 12:00:39 -0400 |
---|---|---|
committer | Kali Kaneko <kali@leap.se> | 2015-10-29 12:00:39 -0400 |
commit | ee0e9cadccd00cb62032d8fc4b322bb6fe3dc7ed (patch) | |
tree | aae58b3f251c5a621d75b8d77428bbd90699e560 /src/leap/common/events/zmq_components.py | |
parent | 3ab6b2aff4a38a4fabd4320880ef795f05ccd17f (diff) | |
parent | 3fabc788c27b2c2619d8e23b3eebc018b95faf7a (diff) |
Merge tag '0.4.4' into debian/experimental
Tag leap.common version 0.4.4
Diffstat (limited to 'src/leap/common/events/zmq_components.py')
-rw-r--r-- | src/leap/common/events/zmq_components.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/leap/common/events/zmq_components.py b/src/leap/common/events/zmq_components.py index f99c754..51de02c 100644 --- a/src/leap/common/events/zmq_components.py +++ b/src/leap/common/events/zmq_components.py @@ -25,6 +25,7 @@ import os import logging import txzmq import re +import time from abc import ABCMeta @@ -36,7 +37,7 @@ try: except ImportError: pass -from leap.common.config import get_path_prefix +from leap.common.config import flags, get_path_prefix from leap.common.zmq_utils import zmq_has_curve from leap.common.zmq_utils import maybe_create_and_get_certificates from leap.common.zmq_utils import PUBLIC_KEYS_PREFIX @@ -64,7 +65,7 @@ class TxZmqComponent(object): self._factory = txzmq.ZmqFactory() self._factory.registerForShutdown() if path_prefix is None: - path_prefix = get_path_prefix() + path_prefix = get_path_prefix(flags.STANDALONE) self._config_prefix = os.path.join(path_prefix, "leap", "events") self._connections = [] @@ -154,6 +155,11 @@ class TxZmqComponent(object): :type socket: zmq.Socket """ authenticator = ThreadAuthenticator(self._factory.context) + + # Temporary fix until we understand what the problem is + # See https://leap.se/code/issues/7536 + time.sleep(0.5) + authenticator.start() # XXX do not hardcode this here. authenticator.allow('127.0.0.1') |