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

[Ashod Nakashian]

 loolwsd/LOOLBroker.cpp |   18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

New commits:
commit c2e0812a8cb1b8caf23ffa73f536d2f587e9db7a
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Mon Apr 4 22:09:09 2016 -0400

    loolwsd: no need to destroy, just exit
    
    Change-Id: I12332678d81b9c0880271f980935b655a1dece08
    Reviewed-on: https://gerrit.libreoffice.org/23823
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp
index 14b6299..ca96cba 100644
--- a/loolwsd/LOOLBroker.cpp
+++ b/loolwsd/LOOLBroker.cpp
@@ -955,13 +955,11 @@ static void lokit_main(const std::string& childRoot,
 
         const Path jailPath = Path::forDirectory(childRoot + Path::separator() + jailId);
         Log::info("Jail path: " + jailPath.toString());
-
         File(jailPath).createDirectories();
 
         // Create a symlink inside the jailPath so that the absolute pathname loTemplate, when
         // interpreted inside a chroot at jailPath, points to loSubPath (relative to the chroot).
         Path symlinkSource(jailPath, Path(loTemplate.substr(1)));
-
         File(symlinkSource.parent()).createDirectories();
 
         std::string symlinkTarget;
@@ -1111,6 +1109,9 @@ static void lokit_main(const std::string& childRoot,
                 },
                 [](){ return TerminationFlag; },
                 socketName);
+
+        // Cleanup jail.
+        Util::removeFile(jailPath, true);
     }
     catch (const Exception& exc)
     {
@@ -1123,18 +1124,6 @@ static void lokit_main(const std::string& childRoot,
         Log::error(std::string("Exception: ") + exc.what());
     }
 
-    if (document)
-    {
-        Log::info("Destroying document [" + document->getUrl() + "].");
-        document.reset();
-    }
-
-    if (loKit)
-    {
-        Log::debug("Destroying LibreOfficeKit instance.");
-        loKit->pClass->destroy(loKit);
-    }
-
     std::ostringstream message;
     message << "rmdoc" << " "
             << Process::id() << " "
@@ -1143,6 +1132,7 @@ static void lokit_main(const std::string& childRoot,
     close(WriterNotify);
 
     Log::info("Process [" + process_name + "] finished.");
+    _exit(Application::EXIT_OK);
 }
 
 class ChildDispatcher