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

[Ashod Nakashian]

 loolwsd/Util.cpp |   15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

New commits:
commit 303d173ae10348433f9b0b845267a317cb69eff6
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Mon Nov 14 00:09:26 2016 -0500

    loolwsd: gracefully shutdown on first CTRL+C then force termination on second
    
    Change-Id: I1c84663d10de8ece715a296eec284b74cdda69df
    Reviewed-on: https://gerrit.libreoffice.org/30834
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loolwsd/Util.cpp b/loolwsd/Util.cpp
index 2bc780c..11d19d1 100644
--- a/loolwsd/Util.cpp
+++ b/loolwsd/Util.cpp
@@ -199,14 +199,23 @@ namespace Util
     static
     void handleTerminationSignal(const int signal)
     {
-        if (!TerminationFlag)
+        if (!ShutdownFlag)
         {
-            TerminationFlag = true;
+            Log::signalLogPrefix();
+            Log::signalLog(" Shutdown signal received: ");
+            Log::signalLog(signalName(signal));
+            Log::signalLog("\n");
+            ShutdownFlag = true;
+            return;
+        }
 
+        if (!TerminationFlag)
+        {
             Log::signalLogPrefix();
-            Log::signalLog(" Termination signal received: ");
+            Log::signalLog(" Forced-Termination signal received: ");
             Log::signalLog(signalName(signal));
             Log::signalLog("\n");
+            TerminationFlag = true;
         }
     }