[Libreoffice-commits] online.git: loolwsd/MasterProcessSession.cpp loolwsd/QueueHandler.hpp

[Ashod Nakashian]

 loolwsd/MasterProcessSession.cpp |    2 +-
 loolwsd/QueueHandler.hpp         |    7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 0cdb8c931fbe27778abedabf9d59ca33ba6672fe
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date:   Wed Jan 6 13:59:15 2016 -0500

    loolwsd: logs
    
    Change-Id: Ib964578ce84eb3dd4b96d483b0e8b53c6cfac853
    Reviewed-on: https://gerrit.libreoffice.org/21180
    Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
    Tested-by: Ashod Nakashian <ashnak...@gmail.com>

diff --git a/loolwsd/MasterProcessSession.cpp b/loolwsd/MasterProcessSession.cpp
index b420d76..99db723 100644
--- a/loolwsd/MasterProcessSession.cpp
+++ b/loolwsd/MasterProcessSession.cpp
@@ -233,7 +233,7 @@ bool MasterProcessSession::_handleInput(const char *buffer, 
int length)
         std::unique_lock<std::mutex> lock(_availableChildSessionMutex);
         _availableChildSessions.emplace(getId(), shared_from_this());
 
-        Log::info() << _kindString << " mapped " << this << " childId=" << 
childId << ", id=" << getId()
+        Log::info() << getName() << " mapped " << this << " childId=" << 
childId << ", id=" << getId()
                     << " into _availableChildSessions, size=" << 
_availableChildSessions.size() << Log::end;
 
         _childId = childId;
diff --git a/loolwsd/QueueHandler.hpp b/loolwsd/QueueHandler.hpp
index 759c175..7a1eb45 100644
--- a/loolwsd/QueueHandler.hpp
+++ b/loolwsd/QueueHandler.hpp
@@ -40,9 +40,16 @@ public:
             {
                 const std::string input = _queue.get();
                 if (input == "eof")
+                {
+                    Log::info("Recieved EOF. Finishing.");
                     break;
+                }
+
                 if (!_session->handleInput(input.c_str(), input.size()))
+                {
+                    Log::info("Socket handler flagged for finishing.");
                     break;
+                }
             }
         }
         catch (const std::exception& exc)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits