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

[Libreoffice Gerrit user]

 wsd/LOOLWSD.cpp |   15 +--------------
 wsd/LOOLWSD.hpp |    5 -----
 2 files changed, 1 insertion(+), 19 deletions(-)

New commits:
commit a6e0d407d57a5c6921faee228d0eabfd4fb0a194
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Oct 16 00:46:47 2018 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Tue Oct 16 00:46:47 2018 +0300

    Bin unused function handleShutdownRequest()
    
    Change-Id: I1be1fdba9623e7d2c5ee0a43c976a5d3ccf9fd28

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index e1fd5b3d0..8d2544e3d 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2848,18 +2848,6 @@ private:
 
 static LOOLWSDServer srv;
 
-bool LOOLWSD::handleShutdownRequest()
-{
-    if (ShutdownRequestFlag)
-    {
-        LOG_INF("Shutdown requested. Initiating WSD shutdown.");
-        Util::alertAllUsers("close: shuttingdown");
-        return true;
-    }
-
-    return false;
-}
-
 int LOOLWSD::innerMain()
 {
 #if !defined FUZZER && !defined MOBILEAPP
diff --git a/wsd/LOOLWSD.hpp b/wsd/LOOLWSD.hpp
index f2c0980f0..92b645e83 100644
--- a/wsd/LOOLWSD.hpp
+++ b/wsd/LOOLWSD.hpp
@@ -75,8 +75,6 @@ public:
 
     static std::vector<int> getKitPids();
 
-    bool handleShutdownRequest();
-
     static std::string GenSessionId()
     {
         return Util::encodeId(++NextSessionId, 4);
commit c2b8b1c0904c7ff0f31315ebe1039081fce6156d
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Oct 16 00:39:21 2018 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Tue Oct 16 00:40:35 2018 +0300

    Bin unused variable ShutdownFlag
    
    Change-Id: I19c91cbf82beda4498b37d29fbca3c603974f46a

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index fa7d16eac..e1fd5b3d0 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2854,7 +2854,6 @@ bool LOOLWSD::handleShutdownRequest()
     {
         LOG_INF("Shutdown requested. Initiating WSD shutdown.");
         Util::alertAllUsers("close: shuttingdown");
-        ShutdownFlag = true;
         return true;
     }
 
@@ -3029,7 +3028,7 @@ int LOOLWSD::innerMain()
 #ifndef MOBILEAPP
     // Stop the listening to new connections
     // and wait until sockets close.
-    LOG_INF("Stopping server socket listening. ShutdownFlag: " <<
+    LOG_INF("Stopping server socket listening. ShutdownRequestFlag: " <<
             ShutdownRequestFlag << ", TerminationFlag: " << TerminationFlag);
 
     // Wait until documents are saved and sessions closed.
diff --git a/wsd/LOOLWSD.hpp b/wsd/LOOLWSD.hpp
index 7eb7c6597..f2c0980f0 100644
--- a/wsd/LOOLWSD.hpp
+++ b/wsd/LOOLWSD.hpp
@@ -75,9 +75,6 @@ public:
 
     static std::vector<int> getKitPids();
 
-    /// Flag to shutdown the server.
-    std::atomic<bool> ShutdownFlag;
-
     bool handleShutdownRequest();
 
     static std::string GenSessionId()