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

[Tor Lillqvist]

 loolwsd/LOOLWSD.cpp |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 1222d7ff6dd46f6bd4989923e0029ac0598c29c7
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Mar 22 18:11:06 2016 +0200

    Linux surely always has WCOREDUMP defined

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index ed4fcb3..9d23a12 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1337,10 +1337,8 @@ int LOOLWSD::main(const std::vector<std::string>& /*args*/)
                 if (WIFSIGNALED(status))
                 {
                     std::string fate = "died";
-#ifdef WCOREDUMP
                     if (WCOREDUMP(status))
                         fate = "core-dumped";
-#endif
                     Log::error() << "Child process [" << pid << "] " << fate
                                  << " with " << Util::signalName(WTERMSIG(status))
                                  << " signal: " << strsignal(WTERMSIG(status))
commit a68f0b89e306b02820828b0887d5723d99c9b974
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Mar 22 17:58:37 2016 +0200

    Improve wording in log message

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 2d74b8a..ed4fcb3 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1368,7 +1368,7 @@ int LOOLWSD::main(const std::vector<std::string>& /*args*/)
             }
             else
             {
-                Log::error("None of our known child processes died. PID: " + std::to_string(pid));
+                Log::error("An unknown child process died, pid: " + std::to_string(pid));
             }
         }
         else if (pid < 0)