[Libreoffice-commits] online.git: wsd/DocumentBroker.cpp wsd/FileServer.cpp wsd/LOOLWSD.cpp

[Michael Meeks]

 wsd/DocumentBroker.cpp |   11 ++++++++++-
 wsd/FileServer.cpp     |    2 --
 wsd/LOOLWSD.cpp        |    2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

New commits:
commit 3b370022c02944fb26cf5f445d49f0d13a65e4e8
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Fri Mar 10 15:37:09 2017 +0000

    Improve state dumping.

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index d2b563d..de6bac6 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -1305,12 +1305,21 @@ void DocumentBroker::dumpState()
 {
     std::unique_lock<std::mutex> lock(_mutex);
 
-    std::cerr << " Broker: " << _filename << "\n";
+    std::cerr << " Broker: " << _filename;
+    if (_markToDestroy)
+        std::cerr << " *** Marked to destroy ***\n";
+    else
+        std::cerr << " has live sessions\n";
+    std::cerr << "  loaded?: " << _isLoaded << "\n";
+    std::cerr << "  modified?: " << _isModified << "\n";
     std::cerr << "  jail id: " << _jailId << "\n";
     std::cerr << "  public uri: " << _uriPublic.toString() << "\n";
     std::cerr << "  jailed uri: " << _uriJailed.toString() << "\n";
     std::cerr << "  doc key: " << _docKey << "\n";
     std::cerr << "  num sessions: " << getSessionsCount() << "\n";
+    std::cerr << "  last editable?: " << _lastEditableSession << "\n";
+    std::cerr << "  cursor " << _cursorPosX << ", " << _cursorPosY
+              << "( " << _cursorWidth << "," << _cursorHeight << ")\n";
 
     _poll->dumpState();
 }
diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp
index f1d35cf..65b43d4 100644
--- a/wsd/FileServer.cpp
+++ b/wsd/FileServer.cpp
@@ -34,8 +34,6 @@
 #include <Poco/StreamCopier.h>
 #include <Poco/StringTokenizer.h>
 #include <Poco/URI.h>
-#include <Poco/Util/ServerApplication.h>
-#include <Poco/Util/Timer.h>
 
 #include "Auth.hpp"
 #include "Common.hpp"
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 589d0b6..8d0a3a4e 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2259,7 +2259,7 @@ private:
             _clientSession = createNewClientSession(ws, _id, uriPublic, docBroker, isReadOnly);
             if (_clientSession)
             {
-                // Transfer the socket to the DocumentBroker.
+                // Transfer the client socket to the DocumentBroker.
                 auto socket = _socket.lock();
                 if (socket)
                 {