hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into LTS_development

Browse source 
# Conflicts:
#	src/controller/controller.cpp
#	src/controller/controller_storage.cpp
#	src/controller/controller_storage.h
This commit is contained in:
Thulinma 2017-05-08 16:10:48 +02:00
commit 85202a0b30
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/controller/controller_api.cpp
View file

@ -428,6 +428,7 @@ void Controller::handleAPICommands(JSON::Value & Request, JSON::Value & Response
//sent current configuration, if not minimal or was changed/requested //sent current configuration, if not minimal or was changed/requested
if (!Request.isMember("minimal") || Request.isMember("config")){ if (!Request.isMember("minimal") || Request.isMember("config")){
Response["config"] = Controller::Storage["config"]; Response["config"] = Controller::Storage["config"];
Response["config"]["iid"] = instanceId;
Response["config"]["version"] = PACKAGE_VERSION; Response["config"]["version"] = PACKAGE_VERSION;
/*LTS-START*/ /*LTS-START*/
#ifdef LICENSING #ifdef LICENSING

2
src/controller/controller_storage.cpp
View file

@ -12,7 +12,7 @@
///\brief Holds everything unique to the controller. ///\brief Holds everything unique to the controller.
namespace Controller{ namespace Controller{
std::string instanceId; /// instanceId (previously uniqId) is first set in controller.cpp before licensing or update calls. std::string instanceId; /// instanceId (previously uniqId) is set in controller.cpp
std::string prometheus; std::string prometheus;
std::string accesslog; std::string accesslog;
Util::Config conf; Util::Config conf;

2
src/controller/controller_storage.h
View file

@ -4,7 +4,7 @@
#include <mist/tinythread.h> #include <mist/tinythread.h>
namespace Controller { namespace Controller {
extern std::string instanceId; ///<global storage of instanceId (previously uniqID) for updater extern std::string instanceId; ///<global storage of instanceId (previously uniqID) is set in controller.cpp
extern std::string prometheus; ///< Prometheus access string extern std::string prometheus; ///< Prometheus access string
extern std::string accesslog; ///< Where to write the access log extern std::string accesslog; ///< Where to write the access log
extern Util::Config conf;///< Global storage of configuration. extern Util::Config conf;///< Global storage of configuration.