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

loolwsd: more informative warnings

Browse source 
Change-Id: I8dba6d003bd5c0b3c16b3cd57c3737638ce56bd1
Reviewed-on: https://gerrit.libreoffice.org/21320
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
This commit is contained in:
Ashod Nakashian 2016-01-08 21:53:57 -05:00 committed by Ashod Nakashian
parent b3d06869f5
commit b2b983476c
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
loolwsd/LOOLBroker.cpp
View file

@ -486,7 +486,8 @@ static bool globalPreinit(const std::string &loSubPath)
preInit = (LokHookPreInit *)dlsym(handle, "lok_preinit");
if (!preInit)
{
Log::warn("Failed to find lok_preinit hook in " + std::string(LIB_SOFFICEAPP) + " library.");
Log::warn("Note: No lok_preinit hook in " + std::string(LIB_SOFFICEAPP) +
" library. Cannot fork, will execv instead.");
return false;
}
@ -711,7 +712,7 @@ int main(int argc, char** argv)
}
catch (const Poco::NotFoundException& exc)
{
Log::error(std::string("Exception: ") + exc.what());
Log::warn("Note: LD_BIND_NOW is not set.");
}
try
@ -720,7 +721,7 @@ int main(int argc, char** argv)
}
catch (const Poco::NotFoundException& exc)
{
Log::error(std::string("Exception: ") + exc.what());
Log::warn("Note: LOK_VIEW_CALLBACK is not set.");
}
// The loolkit binary must be in our directory.

4
loolwsd/LOOLKit.cpp
View file

@ -915,7 +915,7 @@ int main(int argc, char** argv)
}
catch (const Poco::NotFoundException& exc)
{
Log::error(std::string("Exception: ") + exc.what());
Log::warn("Note: LD_BIND_NOW is not set.");
}
try
@ -924,7 +924,7 @@ int main(int argc, char** argv)
}
catch (const Poco::NotFoundException& exc)
{
Log::error(std::string("Exception: ") + exc.what());
Log::warn("Note: LOK_VIEW_CALLBACK is not set.");
}
lokit_main(loSubPath, jailId, pipe);

2
loolwsd/LOOLWSD.cpp
View file

@ -823,7 +823,7 @@ int LOOLWSD::main(const std::vector<std::string>& /*args*/)
Log::initialize("wsd");
Poco::Environment::set("LD_BIND_NOW", "1");
Poco::Environment::set("LOK_VIEW_CALLBACK", "1");
//Poco::Environment::set("LOK_VIEW_CALLBACK", "1");
#ifdef __linux
char *locale = setlocale(LC_ALL, nullptr);