[Libreoffice-commits] online.git: loolwsd/LOOLForKit.cpp loolwsd/LOOLWSD.cpp

[Ashod Nakashian]

 loolwsd/LOOLForKit.cpp |    2 --
 loolwsd/LOOLWSD.cpp    |    9 +++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 213888c45cb419e083df1b898431327137c230af
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date:   Sat Apr 9 17:48:48 2016 -0400

    loolwsd: logging and remove unused vars
    
    Change-Id: Iff4cf5284a959caf84ce6ca5072623b6f95315df
    Reviewed-on: https://gerrit.libreoffice.org/23949
    Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
    Tested-by: Ashod Nakashian <ashnak...@gmail.com>

diff --git a/loolwsd/LOOLForKit.cpp b/loolwsd/LOOLForKit.cpp
index e5ff99b..81a83db 100644
--- a/loolwsd/LOOLForKit.cpp
+++ b/loolwsd/LOOLForKit.cpp
@@ -243,8 +243,6 @@ int main(int argc, char** argv)
     ChildDispatcher childDispatcher;
     Log::info("ForKit process is ready.");
 
-    Timestamp startTime;
-
     while (!TerminationFlag)
     {
         UnitKit::get().invokeForKitTest();
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 9dd8755..a1a3b2a 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1259,11 +1259,12 @@ int LOOLWSD::main(const std::vector<std::string>& 
/*args*/)
     }
 
     if (!UnitWSD::init(UnitWSD::UnitType::TYPE_WSD,
-                         UnitTestLibrary))
+                       UnitTestLibrary))
     {
         Log::error("Failed to load wsd unit test library");
         return Application::EXIT_USAGE;
     }
+
 #ifdef ENABLE_SSL
     initializeSSL();
 #endif
@@ -1418,7 +1419,7 @@ int LOOLWSD::main(const std::vector<std::string>& 
/*args*/)
     preForkChildren();
 
     time_t last30SecCheck = time(NULL);
-    time_t lastFiveMinuteCheck = time(NULL);
+    time_t lastFiveMinuteCheck = last30SecCheck;
 
     int status = 0;
     while (!TerminationFlag && !LOOLWSD::DoTest)
@@ -1488,7 +1489,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);
@@ -1512,7 +1513,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