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

[Henry Castro]

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

New commits:
commit f947b644830c21a2e5d9d7409c42cfb4736e0ab6
Author: Henry Castro <hcastro at collabora.com>
Date:   Tue Dec 29 00:39:25 2015 -0400

    loolwsd: renamed prefix "lool" process
    
    We use prefix loolwsd, loolbroker and loolkit to easy grep process search.
    Also, run_lok_main is not a thread, it is main loop process.

diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp
index e2dc541..34343cb 100644
--- a/loolwsd/LOOLBroker.cpp
+++ b/loolwsd/LOOLBroker.cpp
@@ -875,7 +875,7 @@ int main(int argc, char** argv)
         Process::requestTermination(i.first);
     }
 
-    Log::info("loolbroker finished OK!");
+    Log::info("Process [loolbroker] finished.");
     return 0;
 }
 
diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index d3d7664..716f9e4 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -529,13 +529,13 @@ void run_lok_main(const std::string &loSubPath, const std::string& childId, cons
     assert(!childId.empty());
     assert(!loSubPath.empty());
 
-    static const std::string thread_name = "libreofficekit";
+    static const std::string process_name = "loolkit";
 #ifdef __linux
-    if (prctl(PR_SET_NAME, reinterpret_cast<unsigned long>(thread_name.c_str()), 0, 0, 0) != 0)
-        Log::error("Cannot set thread name to " + thread_name + ".");
+    if (prctl(PR_SET_NAME, reinterpret_cast<unsigned long>(process_name.c_str()), 0, 0, 0) != 0)
+        Log::error("Cannot set process name to " + process_name + ".");
     setSignals(false);
 #endif
-    Log::debug("Thread [" + thread_name + "] started.");
+    Log::debug("Process [" + process_name + "] started.");
 
     static const std::string instdir_path =
 #ifdef __APPLE__
@@ -741,7 +741,7 @@ void run_lok_main(const std::string &loSubPath, const std::string& childId, cons
     loKit->pClass->destroy(loKit.get());
     loKit.release();
 
-    Log::debug("Thread [" + thread_name + "] finished.");
+    Log::info("Process [" + process_name + "] finished.");
 }
 
 #ifndef LOOLKIT_NO_MAIN
@@ -831,7 +831,6 @@ int main(int argc, char** argv)
 
     run_lok_main(loSubPath, childId, pipe);
 
-    Log::info("loolkit finished OK!");
     return 0;
 }
 
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 0f4e533..d8989f2 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1018,7 +1018,7 @@ int LOOLWSD::main(const std::vector<std::string>& /*args*/)
     Log::info("Cleaning up childroot directory [" + childRoot + "].");
     Util::removeFile(childRoot, true);
 
-    Log::info("loolwsd finished OK!");
+    Log::info("Process [loolwsd] finished.");
     return Application::EXIT_OK;
 }