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

[Henry Castro]

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

New commits:
commit 70ff592624f69c9c3804022bd6cb527f3b8022c3
Author: Henry Castro <hcastro at collabora.com>
Date:   Wed Feb 3 18:08:16 2016 -0400

    loolwsd: use strsignal

diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp
index a9af6cd..5776ab9 100644
--- a/loolwsd/LOOLBroker.cpp
+++ b/loolwsd/LOOLBroker.cpp
@@ -970,7 +970,8 @@ int main(int argc, char** argv)
 #endif
                 Log::error() << "Child process [" << pid << "] " << fate
                              << " with " << Util::signalName(WTERMSIG(status))
-                             << " signal. " << Log::end;
+                             << " signal: " << strsignal(WTERMSIG(status))
+                             << Log::end;
 
                 removeChild(pid);
             }
@@ -978,7 +979,8 @@ int main(int argc, char** argv)
             {
                 Log::info() << "Child process [" << pid << "] stopped with "
                             << Util::signalName(WSTOPSIG(status))
-                            << " signal. " << Log::end;
+                            << " signal: " << strsignal(WTERMSIG(status))
+                            << Log::end;
             }
             else if (WIFCONTINUED(status))
             {
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index f382758..eeb3d2d 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1022,7 +1022,8 @@ int LOOLWSD::main(const std::vector<std::string>& /*args*/)
 #endif
                     Log::error() << "Child process [" << pid << "] " << fate
                                  << " with " << Util::signalName(WTERMSIG(status))
-                                 << " signal. " << Log::end;
+                                 << " signal: " << strsignal(WTERMSIG(status))
+                                 << Log::end;
 
                     break;
                 }
@@ -1030,7 +1031,8 @@ int LOOLWSD::main(const std::vector<std::string>& /*args*/)
                 {
                     Log::info() << "Child process [" << pid << "] stopped with "
                                 << Util::signalName(WSTOPSIG(status))
-                                << " signal. " << Log::end;
+                                << " signal: " << strsignal(WTERMSIG(status))
+                                << Log::end;
                 }
                 else if (WIFCONTINUED(status))
                 {
diff --git a/loolwsd/Util.cpp b/loolwsd/Util.cpp
index a764ff4..e4ae391 100644
--- a/loolwsd/Util.cpp
+++ b/loolwsd/Util.cpp
@@ -427,6 +427,7 @@ namespace Util
             TerminationState = ( aSignal == SIGTERM ? LOOLState::LOOL_ABNORMAL : LOOLState::LOOL_STOPPING );
 
             Log::info() << "Termination signal received: "
+                        << Util::signalName(aSignal) << " "
                         << strsignal(aSignal) << Log::end;
         }
     }
@@ -451,6 +452,7 @@ namespace Util
     void handleFatalSignal(const int aSignal)
     {
         Log::error() << "Fatal signal received: "
+                     << Util::signalName(aSignal) << " "
                      << strsignal(aSignal) << Log::end;
 
         if (getenv("LOOL_DEBUG"))