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

[Tor Lillqvist]

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

New commits:
commit f7c213c87e235c5b81a149a40bf5c35ea34013b7
Author: Tor Lillqvist <t...@collabora.com>
Date:   Mon Apr 4 10:31:34 2016 +0300

    Bin leftover from benchmark code
    
    It died in c118987dc6e21053024aee3407425e5cc709b0e3.

diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp
index 430eccc..7eaf07c 100644
--- a/loolwsd/LOOLBroker.cpp
+++ b/loolwsd/LOOLBroker.cpp
@@ -898,8 +898,7 @@ static void lokit_main(const std::string& childRoot,
                        const std::string& sysTemplate,
                        const std::string& loTemplate,
                        const std::string& loSubPath,
-                       const std::string& pipe,
-                       bool doBenchmark = false)
+                       const std::string& pipe)
 {
     // Reinitialize logging when forked.
     Log::initialize("kit");
@@ -934,16 +933,13 @@ static void lokit_main(const std::string& childRoot,
 
     try
     {
-        if (!doBenchmark)
+        // Open notify pipe
+        const Path pipePath = Path::forDirectory(childRoot + Path::separator() 
+ FIFO_PATH);
+        const std::string pipeNotify = Path(pipePath, 
FIFO_ADMIN_NOTIFY).toString();
+        if ((WriterNotify = open(pipeNotify.c_str(), O_WRONLY) ) < 0)
         {
-            // Open notify pipe
-            const Path pipePath = Path::forDirectory(childRoot + 
Path::separator() + FIFO_PATH);
-            const std::string pipeNotify = Path(pipePath, 
FIFO_ADMIN_NOTIFY).toString();
-            if ((WriterNotify = open(pipeNotify.c_str(), O_WRONLY) ) < 0)
-            {
-                Log::error("Error: failed to open notify pipe [" + 
std::string(FIFO_ADMIN_NOTIFY) + "] for writing.");
-                exit(Application::EXIT_SOFTWARE);
-            }
+            Log::error("Error: failed to open notify pipe [" + 
std::string(FIFO_ADMIN_NOTIFY) + "] for writing.");
+            exit(Application::EXIT_SOFTWARE);
         }
 
         const Path jailPath = Path::forDirectory(childRoot + Path::separator() 
+ jailId);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits