summaryrefslogtreecommitdiffstats
path: root/src/ManagementServer.h
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2017-10-16 14:06:19 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2017-10-16 14:06:19 +0200
commite91ff1f3b5193713f2fef7876db40c4af5cbc01b (patch)
tree5c91bfbf153b09594b4922feba258ea05370a411 /src/ManagementServer.h
parent7a57fb48c25b0dae4e372b8e522f308c589bb35e (diff)
downloaddabmux-e91ff1f3b5193713f2fef7876db40c4af5cbc01b.tar.gz
dabmux-e91ff1f3b5193713f2fef7876db40c4af5cbc01b.tar.bz2
dabmux-e91ff1f3b5193713f2fef7876db40c4af5cbc01b.zip
Merge state management command into values, adapt munin accordingly
Diffstat (limited to 'src/ManagementServer.h')
-rw-r--r--src/ManagementServer.h23
1 files changed, 5 insertions, 18 deletions
diff --git a/src/ManagementServer.h b/src/ManagementServer.h
index aade3d0..e75aed3 100644
--- a/src/ManagementServer.h
+++ b/src/ManagementServer.h
@@ -2,7 +2,7 @@
Copyright (C) 2009 Her Majesty the Queen in Right of Canada (Communications
Research Center Canada)
- Copyright (C) 2016
+ Copyright (C) 2017
Matthias P. Braendli, matthias.braendli@mpb.li
http://www.opendigitalradio.org
@@ -18,13 +18,11 @@
The responds in JSON, and accepts the commands:
- config
- values
- Inspired by the munin equivalent
-
- - state
- Returns the state of each input
+ Inspired by the munin equivalent, returns the configuration
+ and the statistics values for every exported stat.
- getptree
- Returns the internal boost property_tree that contains the
+ Returns the internal boost property_tree that contains the
multiplexer configuration DB.
The server is using REQ/REP ZeroMQ sockets.
@@ -46,8 +44,7 @@
along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __MANAGEMENT_SERVER_H
-#define __MANAGEMENT_SERVER_H
+#pragma once
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -278,8 +275,6 @@ class InputStat
std::string encodeValuesJSON(void);
- std::string encodeStateJSON(void);
-
input_state_t determineState(void);
private:
@@ -394,12 +389,6 @@ class ManagementServer
*/
std::string getValuesJSON();
- /* Return the state of each input
- *
- * returns: JSON encoded state
- */
- std::string getStateJSON();
-
// mutex for accessing the map
boost::mutex m_statsmutex;
@@ -412,5 +401,3 @@ class ManagementServer
// a reference to it
ManagementServer& get_mgmt_server();
-#endif
-