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

[Ashod Nakashian]

 loolwsd/LOOLBroker.cpp |    7 ++++---
 loolwsd/LOOLKit.cpp    |    4 ++--
 loolwsd/LOOLWSD.cpp    |    2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit b2b983476c63ca5e77e45bae27ca544a0a29cf4f
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Fri Jan 8 21:53:57 2016 -0500

    loolwsd: more informative warnings
    
    Change-Id: I8dba6d003bd5c0b3c16b3cd57c3737638ce56bd1
    Reviewed-on: https://gerrit.libreoffice.org/21320
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp
index 96d2ea1..a63899b 100644
--- a/loolwsd/LOOLBroker.cpp
+++ b/loolwsd/LOOLBroker.cpp
@@ -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.
diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index 06a52d4..dfef497 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -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);
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index dbc4184..1d1a17b 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -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);