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

[Ashod Nakashian]

 loolwsd/LOOLBroker.cpp           |   14 +++++++-------
 loolwsd/LOOLKit.cpp              |    4 ++--
 loolwsd/MasterProcessSession.cpp |    2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 9150d560c05a6c88cbff1e8f010655bc61eeabb6
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Mon Mar 28 09:01:46 2016 -0400

    loolwsd: thread -> session
    
    Change-Id: I7d9f84a2c9afea5f541f5815929745d2de93c8fa
    Reviewed-on: https://gerrit.libreoffice.org/23642
    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 af64448..eab8777 100644
--- a/loolwsd/LOOLBroker.cpp
+++ b/loolwsd/LOOLBroker.cpp
@@ -240,19 +240,19 @@ public:
         return bytes;
     }
 
-    bool createThread(const Process::PID pid, const std::string& session, const std::string& url)
+    bool createSession(const Process::PID pid, const std::string& session, const std::string& url)
     {
-        const std::string message = "thread " + session + " " + url + "\r\n";
+        const std::string message = "session " + session + " " + url + "\r\n";
         if (IoUtil::writeFIFO(getChildPipe(pid), message) < 0)
         {
-            Log::error("Error sending thread message to child [" + std::to_string(pid) + "].");
+            Log::error("Error sending session message to child [" + std::to_string(pid) + "].");
             return false;
         }
 
         std::string response;
         if (getResponseLine(readerChild, response) < 0)
         {
-            Log::error("Error reading response to thread message from child [" + std::to_string(pid) + "].");
+            Log::error("Error reading response to session message from child [" + std::to_string(pid) + "].");
             return false;
         }
 
@@ -326,7 +326,7 @@ public:
             const std::string session = tokens[1];
             const std::string url = tokens[2];
 
-            Log::debug("Finding kit for URL [" + url + "] on thread [" + session + "].");
+            Log::debug("Finding kit for URL [" + url + "] on session [" + session + "].");
 
             const auto child = findChild(url);
             if (child)
@@ -342,14 +342,14 @@ public:
                     Log::debug("Found URL [" + url + "] hosted on child [" + childPid + "].");
                 }
 
-                if (createThread(child->getPid(), session, url))
+                if (createSession(child->getPid(), session, url))
                 {
                     child->setUrl(url);
                     Log::debug("Child [" + childPid + "] now hosts [" + url + "] for session [" + session + "].");
                 }
                 else
                 {
-                    Log::error("Error creating thread [" + session + "] for URL [" + url + "] on child [" + childPid + "].");
+                    Log::error("Error creating session [" + session + "] for URL [" + url + "] on child [" + childPid + "].");
                     if (isEmptyChild)
                     {
                         // This is probably a child in bad state. Rid of it and create new.
diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index fa98b6c..8c9ef9f 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -1015,7 +1015,7 @@ void lokit_main(const std::string& childRoot,
                         // Too late, we're going down.
                         response += "down \r\n";
                     }
-                    else if (tokens[0] == "thread")
+                    else if (tokens[0] == "session")
                     {
                         const std::string& sessionId = tokens[1];
                         const unsigned intSessionId = Util::decodeId(sessionId);
@@ -1056,7 +1056,7 @@ void lokit_main(const std::string& childRoot,
                     }
                     else
                     {
-                        response += "bad \r\n";
+                        response += "bad unknown token [" + tokens[0] + "] \r\n";
                     }
 
                     IoUtil::writeFIFO(writerBroker, response);
diff --git a/loolwsd/MasterProcessSession.cpp b/loolwsd/MasterProcessSession.cpp
index 459bdc7..3be97d5 100644
--- a/loolwsd/MasterProcessSession.cpp
+++ b/loolwsd/MasterProcessSession.cpp
@@ -736,7 +736,7 @@ void MasterProcessSession::dispatchChild()
     std::shared_ptr<MasterProcessSession> childSession;
     std::unique_lock<std::mutex> lock(AvailableChildSessionMutex);
 
-    Log::debug() << "Waiting for a child session permission for thread [" << getId() << "]." << Log::end;
+    Log::debug() << "Waiting for child session [" << getId() << "] to connect." << Log::end;
     while (retries-- && !isFound)
     {
         AvailableChildSessionCV.wait_for(