summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bin/bbackupd/BackupClientDirectoryRecord.cpp4
-rw-r--r--bin/bbackupd/BackupDaemon.h9
-rw-r--r--bin/bbackupd/BackupDaemonInterface.h2
3 files changed, 8 insertions, 7 deletions
diff --git a/bin/bbackupd/BackupClientDirectoryRecord.cpp b/bin/bbackupd/BackupClientDirectoryRecord.cpp
index fb43d7ce..55c154fe 100644
--- a/bin/bbackupd/BackupClientDirectoryRecord.cpp
+++ b/bin/bbackupd/BackupClientDirectoryRecord.cpp
@@ -1278,7 +1278,7 @@ bool BackupClientDirectoryRecord::UpdateItems(
}
}
}
-
+
if (fileSynced)
{
rNotifier.NotifyFileSynchronised(this, nonVssFilePath,
@@ -1857,7 +1857,7 @@ int64_t BackupClientDirectoryRecord::UploadFile(
}
rNotifier.NotifyFileUploaded(this, rNonVssFilePath, FileSize,
- uploadedSize);
+ uploadedSize, objID);
// Return the new object ID of this file
return objID;
diff --git a/bin/bbackupd/BackupDaemon.h b/bin/bbackupd/BackupDaemon.h
index f398e949..0582c623 100644
--- a/bin/bbackupd/BackupDaemon.h
+++ b/bin/bbackupd/BackupDaemon.h
@@ -426,12 +426,13 @@ public:
virtual void NotifyFileUploaded(
const BackupClientDirectoryRecord* pDirRecord,
const std::string& rLocalPath,
- int64_t FileSize, int64_t UploadedSize)
+ int64_t FileSize, int64_t UploadedSize, int64_t ObjectID)
{
if (mLogAllFileAccess)
{
- BOX_NOTICE("Uploaded file: " << rLocalPath << ", "
- "total size = " << FileSize << ", "
+ BOX_NOTICE("Uploaded file: " << rLocalPath <<
+ " (ID " << BOX_FORMAT_OBJECTID(ObjectID) <<
+ "): total size = " << FileSize << ", "
"uploaded size = " << UploadedSize);
}
mNumFilesUploaded++;
@@ -439,7 +440,7 @@ public:
virtual void NotifyFileSynchronised(
const BackupClientDirectoryRecord* pDirRecord,
const std::string& rLocalPath,
- int64_t FileSize)
+ int64_t FileSize)
{
if (mLogAllFileAccess)
{
diff --git a/bin/bbackupd/BackupDaemonInterface.h b/bin/bbackupd/BackupDaemonInterface.h
index eac96d25..d5c47c85 100644
--- a/bin/bbackupd/BackupDaemonInterface.h
+++ b/bin/bbackupd/BackupDaemonInterface.h
@@ -124,7 +124,7 @@ class ProgressNotifier
virtual void NotifyFileUploaded(
const BackupClientDirectoryRecord* pDirRecord,
const std::string& rLocalPath,
- int64_t FileSize, int64_t UploadedSize) = 0;
+ int64_t FileSize, int64_t UploadedSize, int64_t ObjectID) = 0;
virtual void NotifyFileSynchronised(
const BackupClientDirectoryRecord* pDirRecord,
const std::string& rLocalPath,