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

[Henry Castro]

 loolwsd/LOOLKit.cpp |    2 --
 loolwsd/Util.cpp    |    2 --
 2 files changed, 4 deletions(-)

New commits:
commit 45754cc36c7b087700c238d6e9d7d05b5cc04f2f
Author: Henry Castro <hcastro at collabora.com>
Date:   Sun Feb 14 23:07:40 2016 -0400

    loolwsd: remove unused TerminationState

diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index 80a763b..8089bd2 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -835,12 +835,10 @@ void lokit_main(const std::string& childRoot,
         Log::error() << exc.name() << ": " << exc.displayText()
                      << (exc.nested() ? " (" + exc.nested()->displayText() + ")" : "")
                      << Log::end;
-        TerminationState = LOOLState::LOOL_ABNORMAL;
     }
     catch (const std::exception& exc)
     {
         Log::error(std::string("Exception: ") + exc.what());
-        TerminationState = LOOLState::LOOL_ABNORMAL;
     }
 
     Log::debug("Destroying documents.");
diff --git a/loolwsd/Util.cpp b/loolwsd/Util.cpp
index e4ae391..1685d38 100644
--- a/loolwsd/Util.cpp
+++ b/loolwsd/Util.cpp
@@ -60,7 +60,6 @@ extern "C"
     }
 }
 
-volatile LOOLState TerminationState = LOOLState::LOOL_RUNNING;
 volatile bool TerminationFlag = false;
 
 namespace Util
@@ -424,7 +423,6 @@ namespace Util
             // If we are signaled while having that lock,
             // logging again will deadlock on it.
             TerminationFlag = true;
-            TerminationState = ( aSignal == SIGTERM ? LOOLState::LOOL_ABNORMAL : LOOLState::LOOL_STOPPING );
 
             Log::info() << "Termination signal received: "
                         << Util::signalName(aSignal) << " "