From ca9c14dfdd7bd1f7007121b24867b46d7e9c3940 Mon Sep 17 00:00:00 2001 From: Ashod Nakashian Date: Mon, 21 Mar 2016 08:28:18 -0400 Subject: [PATCH] loolwsd: logs and comments Change-Id: I2fbfb7ee7ada48390bec65ee6911bde00885fbdb Reviewed-on: https://gerrit.libreoffice.org/23450 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian --- loolwsd/DocumentBroker.hpp | 3 +-- loolwsd/LOOLBroker.cpp | 2 +- loolwsd/LOOLWSD.cpp | 2 ++ loolwsd/MasterProcessSession.cpp | 1 + loolwsd/Storage.hpp | 3 ++- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/loolwsd/DocumentBroker.hpp b/loolwsd/DocumentBroker.hpp index 2686af382..ac59213b7 100644 --- a/loolwsd/DocumentBroker.hpp +++ b/loolwsd/DocumentBroker.hpp @@ -86,8 +86,7 @@ public: if (_storage) { - // Already loaded. Only validate. - + // Already loaded. Nothing to do. return true; } diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp index 81bf06f9b..890bf0487 100644 --- a/loolwsd/LOOLBroker.cpp +++ b/loolwsd/LOOLBroker.cpp @@ -836,7 +836,7 @@ int main(int argc, char** argv) // Figure out how many children we need. Always create at least as many // as configured pre-spawn or one more than requested (whichever is larger). int spawn = std::max(static_cast(forkCounter) + 1, numPreSpawnedChildren); - Log::debug() << "Creating " << spawn << (spawn == 1 ? "child" : "children") << ". Current total: " + Log::debug() << "Creating " << spawn << (spawn == 1 ? " child" : " children") << ". Current total: " << total << ", Empty: " << empty << Log::end; do { diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp index 38b57cc2f..2d3dd6669 100644 --- a/loolwsd/LOOLWSD.cpp +++ b/loolwsd/LOOLWSD.cpp @@ -630,6 +630,8 @@ private: if (docBroker->getSessionsCount() == 1 && !normalShutdown) { + //TODO: This really should move to the kit, where it + // knows if a doc is unsaved, and if other views are open. Log::info("Non-deliberate shutdown of the last session, saving the document before tearing down."); queue.put("uno .uno:Save"); } diff --git a/loolwsd/MasterProcessSession.cpp b/loolwsd/MasterProcessSession.cpp index 52c8b8139..f7b26ceb2 100644 --- a/loolwsd/MasterProcessSession.cpp +++ b/loolwsd/MasterProcessSession.cpp @@ -778,6 +778,7 @@ void MasterProcessSession::dispatchChild() _peer = childSession; childSession->_peer = shared_from_this(); childSession->_docBroker = _docBroker; + Log::debug("Connected " + getName() + " - " + childSession->getName() + "."); std::ostringstream oss; oss << "load"; diff --git a/loolwsd/Storage.hpp b/loolwsd/Storage.hpp index d18595735..4fe14afc2 100644 --- a/loolwsd/Storage.hpp +++ b/loolwsd/Storage.hpp @@ -35,6 +35,7 @@ public: _jailPath(jailPath), _uri(uri) { + Log::debug("Storage ctor: " + uri); } std::string getLocalRootPath() const @@ -180,7 +181,7 @@ public: logger << "WOPI::GetFile header for URI [" << _uri << "]:\n"; for (auto& pair : response) { - logger << '\t' + pair.first + ": " + pair.second << '\n'; + logger << '\t' + pair.first + ": " + pair.second << " / "; } logger << Log::end;