loolwsd/DocumentBroker.cpp | 4 ++--
loolwsd/LOOLWSD.cpp | 2 --
2 files changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 9d4aeb86d12ccd66731e8478ea4cff5f73ce1373
Author: Tor Lillqvist <t...@collabora.com>
Date: Mon Apr 11 09:15:12 2016 +0300
I doubt we need nanosecond precision here in the logging
(As in "Most recent inactivity was 8096.000000 ms ago".)
diff --git a/loolwsd/DocumentBroker.cpp b/loolwsd/DocumentBroker.cpp
index c7caba4..c931a93 100644
--- a/loolwsd/DocumentBroker.cpp
+++ b/loolwsd/DocumentBroker.cpp
@@ -165,9 +165,9 @@ bool DocumentBroker::autoSave(const bool force)
inactivityTimeMs = std::min(sessionIt.second->getInactivityMS(),
inactivityTimeMs);
}
- Log::trace("Most recent inactivity was " +
std::to_string(inactivityTimeMs) + " ms ago.");
+ Log::trace("Most recent inactivity was " +
std::to_string((int)inactivityTimeMs) + " ms ago.");
const auto timeSinceLastSaveMs = getTimeSinceLastSaveMs();
- Log::trace("Time since last save was " +
std::to_string(timeSinceLastSaveMs) + " ms ago.");
+ Log::trace("Time since last save was " +
std::to_string((int)timeSinceLastSaveMs) + " ms ago.");
// There has been some editing since we saved last?
if (inactivityTimeMs < timeSinceLastSaveMs)
commit dfd17823001efbc9fe9c3dbcc739cd22c8d86745
Author: Tor Lillqvist <t...@collabora.com>
Date: Mon Apr 11 09:09:18 2016 +0300
Probably we can drop the "30-second check" log output
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index bf35d51..e5ee864 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1563,8 +1563,6 @@ int LOOLWSD::main(const std::vector<std::string>&
/*args*/)
{
if (time(nullptr) >= last30SecCheck + 30)
{
- Log::trace("30-second check");
-
try
{
std::unique_lock<std::mutex>
docBrokersLock(docBrokersMutex);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
