[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - wsd/LOOLWSD.cpp wsd/TraceFile.hpp

[Ashod Nakashian]

 wsd/LOOLWSD.cpp   |    1 -
 wsd/TraceFile.hpp |    7 ++++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 16d6c1bc8f69c6f91322907b8777ccdfc21e1652
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Mon May 1 15:33:37 2017 -0400

    wsd: trace file cleanups
    
    Change-Id: I72ccbb9f01d4e27b59d88cca9da05c1472008825
    Reviewed-on: https://gerrit.libreoffice.org/37130
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>
    (cherry picked from commit c31bf89976a14d5dbfb8c4bd012f959284c9344b)
    Reviewed-on: https://gerrit.libreoffice.org/37151
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index b4db3636..c6e009c8 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -787,7 +787,6 @@ void LOOLWSD::initialize(Application& self)
         const auto compress = getConfigValue<bool>(conf, "trace.path[@compress]", false);
         const auto takeSnapshot = getConfigValue<bool>(conf, "trace.path[@snapshot]", false);
         TraceDumper.reset(new TraceFileWriter(path, recordOutgoing, compress, takeSnapshot, filters));
-        LOG_INF("Command trace dumping enabled to file: " << path);
     }
 
     StorageBase::initialize();
diff --git a/wsd/TraceFile.hpp b/wsd/TraceFile.hpp
index 23d46763..d19c0103 100644
--- a/wsd/TraceFile.hpp
+++ b/wsd/TraceFile.hpp
@@ -35,7 +35,7 @@ public:
         Invalid = 0,
         Incoming = '>',
         Outgoing = '<',
-        Event = '-'
+        Event = '~'
     };
 
     TraceFileRecord() :
@@ -115,7 +115,7 @@ public:
                 // Create a snapshot file.
                 const Poco::Path origPath(localPath);
                 std::string filename = origPath.getBaseName();
-                filename += '_' + Poco::DateTimeFormatter::format(Poco::DateTime(), "%Y%m%d_%H~%M~%S");
+                filename += '_' + Poco::DateTimeFormatter::format(Poco::DateTime(), "%Y%m%d_%H-%M-%S");
                 filename += '.' + origPath.getExtension();
                 snapshot = Poco::Path(_path, filename).toString();
 
@@ -273,8 +273,9 @@ private:
         }
 
         std::string res = path.substr(0, pos);
-        res += Poco::DateTimeFormatter::format(Poco::DateTime(), "%Y%m%d_%H~%M~%S");
+        res += Poco::DateTimeFormatter::format(Poco::DateTime(), "%Y%m%d_%H-%M-%S");
         res += path.substr(pos + 1);
+        LOG_INF("Command trace dumping enabled to file: " << res);
         return res;
     }