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

[Ashod Nakashian]

 loolwsd/LOOLKit.cpp |   21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

New commits:
commit b6fae38f17078b3e9b1b6dc267e5402ecc5d7b2f
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Fri Nov 4 00:30:27 2016 -0400

    loolwsd: simplified createSession
    
    Change-Id: I2ebb37cae61d9625731b48ea6b9ce31646ad3e42
    Reviewed-on: https://gerrit.libreoffice.org/30552
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index 66319c3..c257e0b 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -319,29 +319,26 @@ public:
 
         try
         {
-            const auto& it = _sessions.find(sessionId);
-            if (it != _sessions.end())
+            if (_sessions.find(sessionId) != _sessions.end())
             {
-                Log::warn("Session [" + sessionId + "] is already running.");
+                LOG_WRN("Session [" << sessionId << "] on url [" << _url << "] already exists.");
                 return true;
             }
 
-            Log::info() << "Creating " << (_clientViews ? "new" : "first")
-                        << " view for url: " << _url << " for sessionId: " << sessionId
-                        << " on jailId: " << _jailId << Log::end;
+            LOG_INF("Creating " << (_clientViews ? "new" : "first") <<
+                    " session for url: " << _url << " for sessionId: " <<
+                    sessionId << " on jailId: " << _jailId);
 
             auto session = std::make_shared<ChildSession>(sessionId, _jailId, *this);
-            if (!_sessions.emplace(sessionId, session).second)
-            {
-                Log::error("Session already exists for child: " + _jailId + ", session: " + sessionId);
-            }
+            _sessions.emplace(sessionId, session);
 
-            Log::debug("Sessions: " + std::to_string(_sessions.size()));
+            LOG_DBG("Sessions: " << _sessions.size());
             return true;
         }
         catch (const std::exception& ex)
         {
-            Log::error("Exception while creating session [" + sessionId + "] on url [" + _url + "] - '" + ex.what() + "'.");
+            LOG_ERR("Exception while creating session [" << sessionId <<
+                    "] on url [" << _url << "] - '" << ex.what() << "'.");
             return false;
         }
     }