From ec95d6eae6c6c30495b22fa7d53ff6eade06fbb5 Mon Sep 17 00:00:00 2001 From: Volker Birk Date: Tue, 30 Jun 2020 20:14:51 +0200 Subject: [PATCH] implant pEp::Adapter::messageToSend --- server/json-adapter.cc | 9 ++++----- server/json-adapter.hh | 14 +++++++------- server/logger.cc | 2 +- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/server/json-adapter.cc b/server/json-adapter.cc index 9964ad4..6f21830 100644 --- a/server/json-adapter.cc +++ b/server/json-adapter.cc @@ -240,11 +240,11 @@ JsonAdapter& JsonAdapter::deliver_html(bool dh) } -void JsonAdapter::prepare_run(const std::string& address, unsigned start_port, unsigned end_port) +void JsonAdapter::prepare_run(const std::string& address, unsigned start_port, unsigned end_port, ::messageToSend_t messageToSend) { check_guard(); // delayed after constructor, so virtual functions are working: - i->session_registry.reset(new SessionRegistry(this->getMessageToSend(), this->getInjectSyncEvent())); + i->session_registry.reset(new SessionRegistry(messageToSend ? messageToSend : this->getMessageToSend(), this->getInjectSyncEvent())); for(unsigned short port = start_port; port<=end_port; ++port) { @@ -466,11 +466,10 @@ SessionRegistry& JsonAdapter::getSessionRegistry() } -JsonAdapter& JsonAdapter::startup() +JsonAdapter& JsonAdapter::startup(::messageToSend_t messageToSend = nullptr) { JsonAdapter& ja = getInstance(); - ja.prepare_run("127.0.0.1", 4223, 9999); + ja.prepare_run("127.0.0.1", 4223, 9999, messageToSend); ja.run(); return ja; } - diff --git a/server/json-adapter.hh b/server/json-adapter.hh index 22a27e8..94abbaf 100644 --- a/server/json-adapter.hh +++ b/server/json-adapter.hh @@ -36,11 +36,11 @@ public: JsonAdapter& ignore_session_errors(bool _ig); // if called with "false" the JSON Adpapter would no longer deliver HTML and JavaScript files, only handle JSON-RPC requests - JsonAdapter& deliver_html(bool _deliver_html); - + JsonAdapter& deliver_html(bool _deliver_html); + // look for a free port to listen on and set the given configuration - void prepare_run(const std::string& address, unsigned start_port, unsigned end_port); - + void prepare_run(const std::string& address, unsigned start_port, unsigned end_port, ::messageToSend_t messageToSend); + // run the server in another thread and returns immediately. prepare_run() has to be called before! void run(); @@ -93,9 +93,9 @@ public: static JsonAdapter& getInstance(); - static JsonAdapter& startup(); - - static SessionRegistry& getSessionRegistry(); + static SessionRegistry& getSessionRegistry(); + + JsonAdapter& startup(::messageToSend_t messageToSend); protected: diff --git a/server/logger.cc b/server/logger.cc index 2879d06..659d324 100644 --- a/server/logger.cc +++ b/server/logger.cc @@ -55,7 +55,7 @@ namespace LoggerS // namespace containing all data for the Logger singleton. HA LoggerS::filename = filename.empty() ? "/tmp/log-" + program_name + ".log" : filename; #else // WIN23 LoggerS::filename = filename.empty() ? std::string(getenv("TEMP")) - + "\\log-" + program_name + ".log" : filename; + + "\\pEp-JSON.log" : filename; #endif openfile(); }