Module: check_mk
Branch: master
Commit: c9eb7846f493489338521e3b3214960e795ce637
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9eb7846f49348…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Mar 5 13:37:07 2019 +0100
Fixed liveproxy connection to local unix socket
Change-Id: I998aacc0c56019057f4ac832a9f2d8880217d87c
---
cmk/gui/sites.py | 6 +++---
tests/unit/cmk/gui/test_sites.py | 6 ++++++
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/cmk/gui/sites.py b/cmk/gui/sites.py
index 2a5495f..db5822f 100644
--- a/cmk/gui/sites.py
+++ b/cmk/gui/sites.py
@@ -236,12 +236,12 @@ def encode_socket_for_livestatus(site_id, site):
socket_spec = site["socket"]
family_spec, address_spec = socket_spec
- if family_spec == "local":
- return "unix:%s" % cmk.utils.paths.livestatus_unix_socket
-
if site["proxy"] is not None:
return "unix:%sproxy/%s" % (cmk.utils.paths.livestatus_unix_socket,
site_id)
+ if family_spec == "local":
+ return "unix:%s" % cmk.utils.paths.livestatus_unix_socket
+
if family_spec == "unix":
return "%s:%s" % (family_spec, address_spec["path"])
diff --git a/tests/unit/cmk/gui/test_sites.py b/tests/unit/cmk/gui/test_sites.py
index e216807..bb07be6 100644
--- a/tests/unit/cmk/gui/test_sites.py
+++ b/tests/unit/cmk/gui/test_sites.py
@@ -8,6 +8,12 @@ import cmk.gui.sites as sites
"proxy": None
}, "unix:tmp/run/live"),
({
+ "socket": ("local", None),
+ "proxy": {
+ "params": None
+ },
+ }, "unix:tmp/run/liveproxy/mysite"),
+ ({
"socket": ("unix", {
"path": "/a/b/c"
}),