loolwsd/Capabilities.hpp | 4 ++-- loolwsd/IoUtil.cpp | 1 - loolwsd/LOOLKit.cpp | 9 ++++----- loolwsd/LOOLWSD.cpp | 4 ++-- 4 files changed, 8 insertions(+), 10 deletions(-)
New commits: commit fdd3efaad8a538fb65af26d22e65a10ecef2fe27 Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk> Date: Sun Apr 3 23:26:58 2016 -0400 loolwsd: reduced some excessive logs to trace level Change-Id: I9ffcdf5c3ad5781db93e0e3dd7aa7b137c77b25a Reviewed-on: https://gerrit.libreoffice.org/23792 Reviewed-by: Ashod Nakashian <ashnak...@gmail.com> Tested-by: Ashod Nakashian <ashnak...@gmail.com> diff --git a/loolwsd/Capabilities.hpp b/loolwsd/Capabilities.hpp index 1ebb710..3137426 100644 --- a/loolwsd/Capabilities.hpp +++ b/loolwsd/Capabilities.hpp @@ -30,7 +30,7 @@ void dropCapability(cap_value_t capability) } char *capText = cap_to_text(caps, nullptr); - Log::info("Capabilities first: " + std::string(capText)); + Log::trace("Capabilities first: " + std::string(capText)); cap_free(capText); if (cap_set_flag(caps, CAP_EFFECTIVE, sizeof(cap_list)/sizeof(cap_list[0]), cap_list, CAP_CLEAR) == -1 || @@ -47,7 +47,7 @@ void dropCapability(cap_value_t capability) } capText = cap_to_text(caps, nullptr); - Log::info("Capabilities now: " + std::string(capText)); + Log::trace("Capabilities now: " + std::string(capText)); cap_free(capText); cap_free(caps); diff --git a/loolwsd/IoUtil.cpp b/loolwsd/IoUtil.cpp index 7dae0d4..4a8b26f 100644 --- a/loolwsd/IoUtil.cpp +++ b/loolwsd/IoUtil.cpp @@ -301,7 +301,6 @@ int PipeReader::readLine(std::string& line, pipe.events = POLLIN; pipe.revents = 0; const int ready = poll(&pipe, 1, pollTimeoutMs); - Log::trace() << "Poll for pipe: " << _name << " returned: " << ready << Log::end; if (ready == 0) { // Timeout. diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp index e3fd8ce..23b6063 100644 --- a/loolwsd/LOOLKit.cpp +++ b/loolwsd/LOOLKit.cpp @@ -131,7 +131,7 @@ namespace } if (!shouldCopyDir(relativeOldPath)) { - Log::debug("skip redundant paths " + std::string(relativeOldPath)); + Log::trace("skip redundant paths " + std::string(relativeOldPath)); return FTW_SKIP_SUBTREE; } File(newPath).createDirectories(); @@ -389,7 +389,7 @@ public: } catch(Poco::Net::NetException& exc) { - Log::error() << "Document::~Document: NetException: " << exc.displayText() + Log::error() << "Document::~Document: " << exc.displayText() << (exc.nested() ? " (" + exc.nested()->displayText() + ")" : "") << Log::end; } @@ -492,7 +492,7 @@ public: return -1; } - for (auto it =_connections.cbegin(); it != _connections.cend(); ) + for (auto it = _connections.cbegin(); it != _connections.cend(); ) { if (!it->second->isRunning()) { @@ -919,8 +919,7 @@ void lokit_main(const std::string& childRoot, symlinkTarget += "../"; symlinkTarget += loSubPath; - Log::info("symlink(\"" + symlinkTarget + "\",\"" + symlinkSource.toString() + "\")"); - + Log::debug("symlink(\"" + symlinkTarget + "\",\"" + symlinkSource.toString() + "\")"); if (symlink(symlinkTarget.c_str(), symlinkSource.toString().c_str()) == -1) { Log::error("Error: symlink(\"" + symlinkTarget + "\",\"" + symlinkSource.toString() + "\") failed"); diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp index 0332e48..b63d1a4 100644 --- a/loolwsd/LOOLWSD.cpp +++ b/loolwsd/LOOLWSD.cpp @@ -1382,7 +1382,7 @@ int LOOLWSD::main(const std::vector<std::string>& /*args*/) time_t now = time(NULL); if (now >= last30SecCheck + 30) { - Log::debug("30-second check"); + Log::trace("30-second check"); last30SecCheck = now; std::unique_lock<std::mutex> docBrokersLock(docBrokersMutex); @@ -1404,7 +1404,7 @@ int LOOLWSD::main(const std::vector<std::string>& /*args*/) } if (now >= lastFiveMinuteCheck + 300) { - Log::debug("Five-minute check"); + Log::trace("Five-minute check"); lastFiveMinuteCheck = now; std::unique_lock<std::mutex> docBrokersLock(docBrokersMutex); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits