loolwsd/LOOLWSD.cpp | 25 +++++++++++++++++++++++++ loolwsd/LOOLWSD.hpp | 27 +++++---------------------- 2 files changed, 30 insertions(+), 22 deletions(-)
New commits: commit 716b28f4ded0a1023f61561d3facb79601906987 Author: Ashod Nakashian <[email protected]> Date: Wed Aug 17 19:57:38 2016 -0400 loolwsd: forward declare TraceFileWriter and move out of header Change-Id: Id1be0eec0d8a3e9963f986b05ad5426ddb6866c4 Reviewed-on: https://gerrit.libreoffice.org/28288 Reviewed-by: Ashod Nakashian <[email protected]> Tested-by: Ashod Nakashian <[email protected]> diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp index 4aa0d42..e6d9145 100644 --- a/loolwsd/LOOLWSD.cpp +++ b/loolwsd/LOOLWSD.cpp @@ -107,6 +107,7 @@ #include "PrisonerSession.hpp" #include "QueueHandler.hpp" #include "Storage.hpp" +#include "TraceFile.hpp" #include "Unit.hpp" #include "UnitHTTP.hpp" #include "UserMessages.hpp" @@ -1514,6 +1515,30 @@ void LOOLWSD::uninitialize() ServerApplication::uninitialize(); } +void LOOLWSD::dumpEventTrace(const std::string& pId, const std::string& sessionId, const std::string& data) +{ + if (TraceDumper) + { + TraceDumper->writeEvent(pId, sessionId, data); + } +} + +void LOOLWSD::dumpIncomingTrace(const std::string& pId, const std::string& sessionId, const std::string& data) +{ + if (TraceDumper) + { + TraceDumper->writeIncoming(pId, sessionId, data); + } +} + +void LOOLWSD::dumpOutgoingTrace(const std::string& pId, const std::string& sessionId, const std::string& data) +{ + if (TraceDumper) + { + TraceDumper->writeOutgoing(pId, sessionId, data); + } +} + void LOOLWSD::defineOptions(OptionSet& optionSet) { ServerApplication::defineOptions(optionSet); diff --git a/loolwsd/LOOLWSD.hpp b/loolwsd/LOOLWSD.hpp index 2f58ef3..babcb08 100644 --- a/loolwsd/LOOLWSD.hpp +++ b/loolwsd/LOOLWSD.hpp @@ -23,9 +23,10 @@ #include "Auth.hpp" #include "Common.hpp" #include "DocumentBroker.hpp" -#include "TraceFile.hpp" #include "Util.hpp" +class TraceFileWriter; + /// The Server class which is responsible for all /// external interactions. class LOOLWSD: public Poco::Util::ServerApplication @@ -64,31 +65,13 @@ public: } static - void dumpEventTrace(const std::string& pId, const std::string& sessionId, const std::string& data) - { - if (TraceDumper) - { - TraceDumper->writeEvent(pId, sessionId, data); - } - } + void dumpEventTrace(const std::string& pId, const std::string& sessionId, const std::string& data); static - void dumpIncomingTrace(const std::string& pId, const std::string& sessionId, const std::string& data) - { - if (TraceDumper) - { - TraceDumper->writeIncoming(pId, sessionId, data); - } - } + void dumpIncomingTrace(const std::string& pId, const std::string& sessionId, const std::string& data); static - void dumpOutgoingTrace(const std::string& pId, const std::string& sessionId, const std::string& data) - { - if (TraceDumper) - { - TraceDumper->writeOutgoing(pId, sessionId, data); - } - } + void dumpOutgoingTrace(const std::string& pId, const std::string& sessionId, const std::string& data); protected: void initialize(Poco::Util::Application& self) override; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
