From 3e508329b571e27bd0ed6a1d830e763253003fb4 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Wed, 28 Mar 2018 13:00:38 +0200 Subject: [PATCH] csync_update: add the checksum in the discovery log Issue #6414 --- src/csync/csync_update.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/csync/csync_update.cpp b/src/csync/csync_update.cpp index 1ac7e3a13..56b6ffd68 100644 --- a/src/csync/csync_update.cpp +++ b/src/csync/csync_update.cpp @@ -210,14 +210,12 @@ static int _csync_detect_update(CSYNC *ctx, std::unique_ptr f /* we have an update! */ qCInfo(lcUpdate, "Database entry found for %s, compare: %" PRId64 " <-> %" PRId64 ", etag: %s <-> %s, inode: %" PRId64 " <-> %" PRId64 - ", size: %" PRId64 " <-> %" PRId64 ", perms: %x <-> %x, ignore: %d, e2e: %s", - base._path.constData(), + ", size: %" PRId64 " <-> %" PRId64 ", perms: %x <-> %x" + ", checksum: %s <-> %s , ignore: %d", ((int64_t) fs->modtime), ((int64_t) base._modtime), fs->etag.constData(), base._etag.constData(), (uint64_t) fs->inode, (uint64_t) base._inode, - (uint64_t) fs->size, (uint64_t) base._fileSize, - *reinterpret_cast(&fs->remotePerm), *reinterpret_cast(&base._remotePerm), - base._serverHasIgnoredFiles, - base._e2eMangledName.constData()); + (uint64_t) fs->size, (uint64_t) base._fileSize, *reinterpret_cast(&fs->remotePerm), *reinterpret_cast(&base._remotePerm), fs->checksumHeader.constData(), + base._checksumHeader.constData(), base._serverHasIgnoredFiles); if (ctx->current == REMOTE_REPLICA && fs->etag != base._etag) { fs->instruction = CSYNC_INSTRUCTION_EVAL;