[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd-3-2' - 2 commits - common/Log.cpp loleaflet/src

[Ashod Nakashian]

 common/Log.cpp               |    3 ++-
 loleaflet/src/core/Socket.js |    1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit bc9ccf834e3c68dd54d1723856993395b21c02bf
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Thu Apr 19 08:35:23 2018 -0400

    [cd] wsd: log proper ISO date in YYYY-MM-DD format
    
    Change-Id: I8851c044bad43a03a99f7471be97ea77c58f7be8
    Reviewed-on: https://gerrit.libreoffice.org/53266
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/common/Log.cpp b/common/Log.cpp
index 94d2fd13e..78802d4c9 100644
--- a/common/Log.cpp
+++ b/common/Log.cpp
@@ -112,9 +112,10 @@ namespace Log
         }
 
         Poco::DateTime time;
-        snprintf(buffer, 1023, "%s-%.05lu %.2u:%.2u:%.2u.%.6u [ %s ] %s  ",
+        snprintf(buffer, 1023, "%s-%.05lu %.4u-%.2u-%.2u %.2u:%.2u:%.2u.%.6u [ %s ] %s  ",
                     (Source.inited ? Source.id.c_str() : "<shutdown>"),
                     osTid,
+                    time.year(), time.month(), time.day(),
                     time.hour(), time.minute(), time.second(),
                     time.millisecond() * 1000 + time.microsecond(),
                     threadName, level);
commit 19dd3f8d17fbfa7cb95ac879ebecc3e1b6d8a585
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Mon Mar 19 20:58:40 2018 -0400

    [cd] leaflet: don't show 'failed to load doc' error
    
    Change-Id: I5219a1f78f22dceb193d8a1856b3bd208e5ebbcf

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index ce05a4a6d..aae9f0f89 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -420,6 +420,7 @@ L.Socket = L.Class.extend({
 				// better we do it first so that another error message doesn't override this one
 				// upon socket close.
 				this.close();
+				return; // Don't show this message.
 			}
 			else if (command.errorKind === 'documentconflict')
 			{