[Box Backup-commit] COMMIT r3391 - box/trunk/bin/bbackupd

subversion at boxbackup.org subversion at boxbackup.org
Thu Sep 4 02:36:45 BST 2014


Author: chris
Date: 2014-09-04 02:36:44 +0100 (Thu, 04 Sep 2014)
New Revision: 3391

Modified:
   box/trunk/bin/bbackupd/BackupClientDirectoryRecord.cpp
   box/trunk/bin/bbackupd/BackupDaemon.h
   box/trunk/bin/bbackupd/BackupDaemonInterface.h
Log:
Add the new object ID to NotifyFileUploaded messages.

Modified: box/trunk/bin/bbackupd/BackupClientDirectoryRecord.cpp
===================================================================
--- box/trunk/bin/bbackupd/BackupClientDirectoryRecord.cpp	2014-09-04 01:36:43 UTC (rev 3390)
+++ box/trunk/bin/bbackupd/BackupClientDirectoryRecord.cpp	2014-09-04 01:36:44 UTC (rev 3391)
@@ -1278,7 +1278,7 @@
 				}
 			}
 		}
-		
+
 		if (fileSynced)
 		{
 			rNotifier.NotifyFileSynchronised(this, nonVssFilePath,
@@ -1857,7 +1857,7 @@
 	}
 
 	rNotifier.NotifyFileUploaded(this, rNonVssFilePath, FileSize,
-		uploadedSize);
+		uploadedSize, objID);
 
 	// Return the new object ID of this file
 	return objID;

Modified: box/trunk/bin/bbackupd/BackupDaemon.h
===================================================================
--- box/trunk/bin/bbackupd/BackupDaemon.h	2014-09-04 01:36:43 UTC (rev 3390)
+++ box/trunk/bin/bbackupd/BackupDaemon.h	2014-09-04 01:36:44 UTC (rev 3391)
@@ -426,12 +426,13 @@
 	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 @@
 	virtual void NotifyFileSynchronised(
 		const BackupClientDirectoryRecord* pDirRecord,
 		const std::string& rLocalPath,
-		int64_t FileSize) 
+		int64_t FileSize)
 	{
 		if (mLogAllFileAccess)
 		{

Modified: box/trunk/bin/bbackupd/BackupDaemonInterface.h
===================================================================
--- box/trunk/bin/bbackupd/BackupDaemonInterface.h	2014-09-04 01:36:43 UTC (rev 3390)
+++ box/trunk/bin/bbackupd/BackupDaemonInterface.h	2014-09-04 01:36:44 UTC (rev 3391)
@@ -124,7 +124,7 @@
 	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,




More information about the Boxbackup-commit mailing list