[Libreoffice-commits] online.git: 2 commits - loolwsd/protocol.txt loolwsd/Util.cpp

[Tor Lillqvist]

 loolwsd/Util.cpp     |    2 +-
 loolwsd/protocol.txt |   10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit bc7decb6ca0b16ae4ead2130815e913928c482ff
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Feb 24 17:39:30 2016 +0200

    No "disconnect" message is sent by our client JS code (and that is good)
    
    Having a separate "disconnect" message is a disgrace. There should be
    no need for it. WebSocket has a perfectly fine graceful disconnect
    mechanism already (CLOSE frames). The code needs to be prepared to
    receive a CLOSE frame at any time. The code also needs to be prepared
    for the underlying socket being bluntly closed by the other end,
    without sending any WebSocket CLOSE frame. The only sane thing is to
    handle a "disconnect" message in the same way as those situations
    anyway, so why is it needed?

diff --git a/loolwsd/protocol.txt b/loolwsd/protocol.txt
index cf08bb4..ab5142c 100644
--- a/loolwsd/protocol.txt
+++ b/loolwsd/protocol.txt
@@ -17,11 +17,6 @@ canceltiles
     dropped and will not be handled. There is no guarantee of exactly
     which tile: messages might still be sent back to the client.
 
-disconnect [reason]
-
-    Sent before disconnecting gracefully.
-    reason: optional human-readable reason to disconnect.
-
 downloadas name=<fileName> id=<id> format=<document format> options=<SkipImages, etc>
 
     Exports the current document to the desired format and returns a download URL
@@ -262,6 +257,11 @@ curpart: part=<partNumber>
     needs to act on in addition to passing them on to the client, like
     invalidatetiles:
 
+disconnect [reason]
+
+    Sent before disconnecting gracefully.
+    reason: optional human-readable reason to disconnect.
+
 nextmessage: size=<upperlimit>
 
     each tile: message sent from the child to the parent is preceded
commit 46b43602fd21c1b3a8c5e084caab4a07d1019bf4
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Feb 24 13:53:25 2016 +0200

    No colours in the log, thanks
    
    The escape sequences just make the log harder to read in an editor.

diff --git a/loolwsd/Util.cpp b/loolwsd/Util.cpp
index 33738de..4655f3c 100644
--- a/loolwsd/Util.cpp
+++ b/loolwsd/Util.cpp
@@ -120,7 +120,7 @@ namespace Log
             << std::setw(5) << std::setfill('0') << Poco::Process::id();
         SourceId = oss.str();
 
-        auto& logger = Poco::Logger::create(SourceName, new Poco::ColorConsoleChannel(), Poco::Message::PRIO_INFORMATION);
+        auto& logger = Poco::Logger::create(SourceName, new Poco::ConsoleChannel(), Poco::Message::PRIO_INFORMATION);
 
         // Configure the logger.
         // TODO: This should come from a file.