diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2015-10-06 14:41:18 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2015-10-07 12:11:06 -0300 |
| commit | 459024de9e36aea0813aa01a570b68db7e9c1a26 (patch) | |
| tree | ac54c343fb057219aaad7b128cfe0adc9a1125ff /src/leap/common/events | |
| parent | d3519a062ea6924fa6b6b5cb4d804b5a39eb249f (diff) | |
[bug] consider STANDALONE for the paths
Since we need to write a file we have to consider whether we are
running in 'standalone' mode or not to use the right path prefix.
- Related: #7512
Diffstat (limited to 'src/leap/common/events')
| -rw-r--r-- | src/leap/common/events/client.py | 5 | ||||
| -rw-r--r-- | src/leap/common/events/txclient.py | 2 | ||||
| -rw-r--r-- | src/leap/common/events/zmq_components.py | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/leap/common/events/client.py b/src/leap/common/events/client.py index e38e9d3..60d24bc 100644 --- a/src/leap/common/events/client.py +++ b/src/leap/common/events/client.py @@ -47,7 +47,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 @@ -55,7 +55,6 @@ from leap.common.zmq_utils import PUBLIC_KEYS_PREFIX from leap.common.events.errors import CallbackAlreadyRegisteredError from leap.common.events.server import EMIT_ADDR from leap.common.events.server import REG_ADDR -from leap.common.events import flags from leap.common.events import catalog @@ -280,7 +279,7 @@ class EventsClientThread(threading.Thread, EventsClient): self._lock = threading.Lock() self._initialized = threading.Event() self._config_prefix = os.path.join( - get_path_prefix(), "leap", "events") + get_path_prefix(flags.STANDALONE), "leap", "events") self._loop = None self._context = None self._push = None diff --git a/src/leap/common/events/txclient.py b/src/leap/common/events/txclient.py index f3c183e..dfd0533 100644 --- a/src/leap/common/events/txclient.py +++ b/src/leap/common/events/txclient.py @@ -35,7 +35,7 @@ from leap.common.events.client import EventsClient from leap.common.events.client import configure_client from leap.common.events.server import EMIT_ADDR from leap.common.events.server import REG_ADDR -from leap.common.events import catalog, flags +from leap.common.events import catalog logger = logging.getLogger(__name__) diff --git a/src/leap/common/events/zmq_components.py b/src/leap/common/events/zmq_components.py index f99c754..729ca90 100644 --- a/src/leap/common/events/zmq_components.py +++ b/src/leap/common/events/zmq_components.py @@ -36,7 +36,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 +64,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 = [] |