summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2018-03-07 11:43:04 +0100
committerMatthias P. Braendli <matthias.braendli@mpb.li>2018-03-07 11:43:04 +0100
commitf7addcf7d00621f0973f2c6a997893ff3d7f6c3e (patch)
tree86e5f3188c7c2f3df6c3edc4614c60483b217413
parent48b481e76f0c40bc93a62a29f40198131d9f551e (diff)
downloaddabmux-f7addcf7d00621f0973f2c6a997893ff3d7f6c3e.tar.gz
dabmux-f7addcf7d00621f0973f2c6a997893ff3d7f6c3e.tar.bz2
dabmux-f7addcf7d00621f0973f2c6a997893ff3d7f6c3e.zip
Add version string to management server
-rwxr-xr-xdoc/show_dabmux_stats.py8
-rw-r--r--src/ManagementServer.cpp14
2 files changed, 17 insertions, 5 deletions
diff --git a/doc/show_dabmux_stats.py b/doc/show_dabmux_stats.py
index f781839..1216593 100755
--- a/doc/show_dabmux_stats.py
+++ b/doc/show_dabmux_stats.py
@@ -22,10 +22,12 @@ def connect():
sock.connect("tcp://localhost:12720")
sock.send("info")
- version = json.loads(sock.recv())
+ infojson = json.loads(sock.recv())
- if not version['service'].startswith("ODR-DabMux"):
- sys.stderr.write("Wrong version\n")
+ sys.stderr.write("Statistics from ODR-DabMux {}\n".format(infojson['version']))
+
+ if not infojson['service'].startswith("ODR-DabMux"):
+ sys.stderr.write("This is not ODR-DabMux: {}\n".format(infojson['service']))
sys.exit(1)
return sock
diff --git a/src/ManagementServer.cpp b/src/ManagementServer.cpp
index cd70b77..092b257 100644
--- a/src/ManagementServer.cpp
+++ b/src/ManagementServer.cpp
@@ -298,14 +298,24 @@ void ManagementServer::handle_message(zmq::message_t& zmq_message)
if (data == "info") {
answer <<
- "{ \"service\": \"" <<
+ "{ " <<
+ "\"service\": \"" <<
PACKAGE_NAME << " " <<
#if defined(GITVERSION)
GITVERSION <<
#else
PACKAGE_VERSION <<
#endif
- " MGMT Server\" }\n";
+ " MGMT Server\", "
+ <<
+ "\"version\": \"" <<
+#if defined(GITVERSION)
+ GITVERSION <<
+#else
+ PACKAGE_VERSION <<
+#endif
+ "\" "
+ << "}\n";
}
else if (data == "config") {
answer << getStatConfigJSON();