strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

loolwsd: logging and remove unused vars

Browse source 
Change-Id: Iff4cf5284a959caf84ce6ca5072623b6f95315df
Reviewed-on: https://gerrit.libreoffice.org/23949
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
This commit is contained in:
Ashod Nakashian 2016-04-09 17:48:48 -04:00 committed by Ashod Nakashian
parent b6d2edb0e3
commit 213888c45c
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
loolwsd/LOOLForKit.cpp
View file

@ -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();

9
loolwsd/LOOLWSD.cpp
View file

@ -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);