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

[Ashod Nakashian]

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

New commits:
commit f81aa9d2af71ec5b833dbaebf976706f8aad373c
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Sat Jul 30 10:59:38 2016 -0400

    loolwsd: setup signal handling first thing in main
    
    Change-Id: I006dcb5816719bc220409050bf59dd530c46acfd
    Reviewed-on: https://gerrit.libreoffice.org/27950
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 8ba1fee..7d8c61a 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1572,6 +1572,9 @@ Process::PID LOOLWSD::createForKit()
 
 int LOOLWSD::main(const std::vector<std::string>& /*args*/)
 {
+    Util::setTerminationSignals();
+    Util::setFatalSignals();
+
     if (DisplayVersion)
     {
         std::string version, hash;
@@ -1585,9 +1588,6 @@ int LOOLWSD::main(const std::vector<std::string>& /*args*/)
     if (locale == nullptr || std::strcmp(locale, "C") == 0)
         setlocale(LC_ALL, "en_US.utf8");
 
-    Util::setTerminationSignals();
-    Util::setFatalSignals();
-
     if (access(Cache.c_str(), R_OK | W_OK | X_OK) != 0)
     {
         Log::syserror("Unable to access cache [" + Cache +