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

[Tor Lillqvist]

 loolwsd/LOOLForKit.cpp |    4 ++--
 loolwsd/LOOLWSD.cpp    |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 9086f378d8eab3749f0a42acf33da3842546fee1
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Apr 12 14:48:26 2016 +0300

    Pedantry

diff --git a/loolwsd/LOOLForKit.cpp b/loolwsd/LOOLForKit.cpp
index 41bd095..dd74a2c 100644
--- a/loolwsd/LOOLForKit.cpp
+++ b/loolwsd/LOOLForKit.cpp
@@ -73,12 +73,12 @@ private:
             const auto count = std::stoi(tokens[1]);
             if (count > 0)
             {
-                Log::info("Spawning " + tokens[1] + " children per request.");
+                Log::info("Spawning " + tokens[1] + " " + (count == 1 ? "child" : "children") + " per request.");
                 ForkCounter = count;
             }
             else
             {
-                Log::warn("Cannot spawn " + std::to_string(count) + " children as requested.");
+                Log::warn("Cannot spawn " + tokens[1] + " children as requested.");
             }
         }
     }
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index bcab1c4..5775146 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -754,7 +754,7 @@ public:
             auto ws = std::make_shared<WebSocket>(request, response);
             std::unique_lock<std::mutex> lock(newChildrenMutex);
             newChildren.emplace_back(std::make_shared<ChildProcess>(pid, ws));
-            Log::info("Have " + std::to_string(newChildren.size()) + " children.");
+            Log::info("Have " + std::to_string(newChildren.size()) + " " + (newChildren.size() == 1 ? "child" : "children") + ".");
             newChildrenCV.notify_one();
             UnitWSD::get().newChild();
             return;