[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - 2 commits - common/Log.cpp common/Log.hpp kit/Kit.cpp

[Libreoffice Gerrit user]

 common/Log.cpp |    2 ++
 common/Log.hpp |    2 ++
 kit/Kit.cpp    |    6 +++---
 3 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit eea64ece29f50770b8c81e9f398e5bb5d3a4bcf1
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon May 13 16:47:19 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon May 13 16:53:06 2019 +0300

    Use consistent terminology in LOG_INF() calls around runLoop() call
    
    Change-Id: I46d954250447dea6ffa60c6e0e341f23a9ad4ff9

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index c11be7662..19689f73f 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -2769,7 +2769,7 @@ void lokit_main(
 
         loKit->runLoop(pollCallback, wakeCallback, &mainKit);
 
-        LOG_INF("Kit poll terminated.");
+        LOG_INF("Kit unipoll loop run terminated.");
 
 #if MOBILEAPP
         SocketPoll::wakeupWorld();
commit cdec6ac2a2d857b6fa06657cf6df4c12d9e4a818
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon May 13 16:45:24 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon May 13 16:52:50 2019 +0300

    No need to call Log::shutdown() in a mobile app
    
    The process never exists voluntarily. It is killed by the OS when
    inactive and its resources are needed.
    
    Change-Id: I9a7fa8200a44bba8dfcd2b09882f1b87814025be

diff --git a/common/Log.cpp b/common/Log.cpp
index eb3892643..51c100522 100644
--- a/common/Log.cpp
+++ b/common/Log.cpp
@@ -204,6 +204,7 @@ namespace Log
                        : Poco::Logger::get(Source.getInited() ? Source.getName() : std::string());
     }
 
+#if !MOBILEAPP
     void shutdown()
     {
         logger().shutdown();
@@ -214,6 +215,7 @@ namespace Log
         std::flush(std::cerr);
         fflush(stderr);
     }
+#endif
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/common/Log.hpp b/common/Log.hpp
index bf05fc7ce..b8cf36878 100644
--- a/common/Log.hpp
+++ b/common/Log.hpp
@@ -45,8 +45,10 @@ namespace Log
     /// Returns the underlying logging system.
     Poco::Logger& logger();
 
+#if !MOBILEAPP
     /// Shutdown and release the logging system.
     void shutdown();
+#endif
 
     char* prefix(char* buffer, std::size_t len, const char* level);
 
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index fa80d1a69..c11be7662 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -2773,14 +2773,14 @@ void lokit_main(
 
 #if MOBILEAPP
         SocketPoll::wakeupWorld();
-#endif
-
+#else
         // Trap the signal handler, if invoked,
         // to prevent exiting.
         LOG_INF("Process finished.");
         Log::shutdown();
 
         // Let forkit handle the jail cleanup.
+#endif
     }
     catch (const Exception& exc)
     {