diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-03-07 17:19:31 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-03-07 17:27:12 +0100 |
| commit | 3f4214227e993305bb320b299245f466b9b22233 (patch) | |
| tree | 0863975f29692d0939e3acc53b76a00e97f2aadc /src/ConfigParser.cpp | |
| parent | 0414d5788090bb6df728d370079e44e95b4ffd20 (diff) | |
| download | dabmux-3f4214227e993305bb320b299245f466b9b22233.tar.gz dabmux-3f4214227e993305bb320b299245f466b9b22233.tar.bz2 dabmux-3f4214227e993305bb320b299245f466b9b22233.zip | |
Merge Stats and Config server, config is also JSON
Diffstat (limited to 'src/ConfigParser.cpp')
| -rw-r--r-- | src/ConfigParser.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/ConfigParser.cpp b/src/ConfigParser.cpp index 2c4ab63..8c5cbaa 100644 --- a/src/ConfigParser.cpp +++ b/src/ConfigParser.cpp @@ -67,7 +67,7 @@ #include "dabInputDmbUdp.h" #include "dabInputZmq.h" #include "DabMux.h" -#include "StatsServer.h" +#include "ManagementServer.h" #ifdef _WIN32 @@ -132,7 +132,7 @@ void parse_ptree(boost::property_tree::ptree& pt, bool* factumAnalyzer, unsigned long* limit, BaseRemoteController** rc, - int* statsServerPort, + int* mgmtserverport, edi_configuration_t* edi ) { @@ -169,7 +169,8 @@ void parse_ptree(boost::property_tree::ptree& pt, *enableTist = pt_general.get("tist", false); - *statsServerPort = pt_general.get<int>("statsserverport", 0); + *mgmtserverport = pt_general.get<int>("managementport", + pt_general.get<int>("statsserverport", 0) ); /************** READ REMOTE CONTROL PARAMETERS *************/ ptree pt_rc = pt.get_child("remotecontrol"); |