From: Olivier Goffart <ogoffart@woboq.com>
Date: Tue, 24 Apr 2018 11:22:59 +0000 (+0200)
Subject: SyncRunFileLog: Add the requestid
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~21^2~468^2~586
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a877a9d472696c749dafe86f75ec1151bc187b27;p=nextcloud-desktop.git

SyncRunFileLog: Add the requestid

https://github.com/owncloud/client/pull/6427#issuecomment-383879509
---

diff --git a/src/gui/syncrunfilelog.cpp b/src/gui/syncrunfilelog.cpp
index e3b14d7d4..14250015e 100644
--- a/src/gui/syncrunfilelog.cpp
+++ b/src/gui/syncrunfilelog.cpp
@@ -145,8 +145,7 @@ void SyncRunFileLog::start(const QString &folderPath)
         // We are creating a new file, add the note.
         _out << "# timestamp | duration | file | instruction | dir | modtime | etag | "
                 "size | fileId | status | errorString | http result code | "
-                "other size | other modtime | other etag | other fileId | "
-                "other instruction"
+                "other size | other modtime | X-Request-ID"
              << endl;
 
         FileSystem::setFileHidden(filename, true);
@@ -191,9 +190,7 @@ void SyncRunFileLog::logItem(const SyncFileItem &item)
     _out << QString::number(item._httpErrorCode) << L;
     _out << QString::number(item._previousSize) << L;
     _out << QString::number(item._previousModtime) << L;
-    _out /* << other etag (removed) */ << L;
-    _out /* << other fileId (removed) */ << L;
-    _out /* << other instruction (removed) */ << L;
+    _out << item._requestId << L;
 
     _out << endl;
 }