[Libreoffice-commits] online.git: 2 commits - loleaflet/dist loolwsd/Util.cpp

[Jan Holesovsky]

 loleaflet/dist/loleaflet.html |    5 ++++-
 loolwsd/Util.cpp              |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 09ee912e0878c78b5bc1cdde82297b0254f4e008
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue Mar 29 14:36:03 2016 +0200

    loolwsd: Default to the most verbose log level.
    
    Still in heavy development, useful to know about everything...

diff --git a/loolwsd/Util.cpp b/loolwsd/Util.cpp
index 5fc9a2a..477cffd 100644
--- a/loolwsd/Util.cpp
+++ b/loolwsd/Util.cpp
@@ -133,7 +133,7 @@ namespace Log
         auto channel = (isatty(fileno(stdout)) || std::getenv("LOOL_LOGCOLOR")
                      ? static_cast<Poco::Channel*>(new Poco::ColorConsoleChannel())
                      : static_cast<Poco::Channel*>(new Poco::ConsoleChannel()));
-        auto& logger = Poco::Logger::create(SourceName, channel, Poco::Message::PRIO_INFORMATION);
+        auto& logger = Poco::Logger::create(SourceName, channel, Poco::Message::PRIO_TRACE);
 
         // Configure the logger.
         // TODO: This should come from a file.
commit 9b54337568632a1dbc41425496ac5dd01733210d
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue Mar 29 14:35:32 2016 +0200

    loleaflet: Warn when somebody tries to use ws: for the websocket.

diff --git a/loleaflet/dist/loleaflet.html b/loleaflet/dist/loleaflet.html
index 9f89fb6..1bf51ff 100644
--- a/loleaflet/dist/loleaflet.html
+++ b/loleaflet/dist/loleaflet.html
@@ -277,7 +277,10 @@
         vex.dialog.alert('Wrong WOPISrc, usage: WOPISrc=valid encoded URI,  or file_path, usage: file_path=/path/to/doc/');
     }
     if (host === '') {
-        vex.dialog.alert('Wrong host, usage: host=wss://localhost:9980');
+	vex.dialog.alert('The host URL is empty, usage: host=wss://localhost:9980');
+    }
+    if (host.startsWith('ws:')) {
+        vex.dialog.alert('Please use wss: instead of ws: in the host URL, usage: host=wss://localhost:9980');
     }
     var docURL = wopiSrc !== '' ? wopiSrc : filePath;