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

[subversion at boxbackup.org]

Author: chris
Date: 2011-10-25 23:27:56 +0100 (Tue, 25 Oct 2011)
New Revision: 3031

Modified:
   box/trunk/bin/bbackupd/BackupClientDirectoryRecord.cpp
   box/trunk/bin/bbackupd/BackupClientDirectoryRecord.h
Log:
Fix logging of real (non-VSS) paths in UploadFile*.


Modified: box/trunk/bin/bbackupd/BackupClientDirectoryRecord.cpp
===================================================================
--- box/trunk/bin/bbackupd/BackupClientDirectoryRecord.cpp	2011-10-25 22:03:07 UTC (rev 3030)
+++ box/trunk/bin/bbackupd/BackupClientDirectoryRecord.cpp	2011-10-25 22:27:56 UTC (rev 3031)
@@ -258,8 +258,9 @@
 		DIR *dirHandle = 0;
 		try
 		{
-			rNotifier.NotifyScanDirectory(this,
-				ConvertVssPathToRealPath(rLocalPath, rBackupLocation));
+			std::string nonVssDirPath = ConvertVssPathToRealPath(rLocalPath,
+					rBackupLocation);
+			rNotifier.NotifyScanDirectory(this, nonVssDirPath);
 
 			dirHandle = ::opendir(rLocalPath.c_str());
 			if(dirHandle == 0)
@@ -269,19 +270,20 @@
 				if (errno == EACCES)
 				{
 					rNotifier.NotifyDirListFailed(this,
-						ConvertVssPathToRealPath(rLocalPath, rBackupLocation),
+						nonVssDirPath,
 						"Access denied");
 				}
 				else
 				{
 					rNotifier.NotifyDirListFailed(this, 
-						ConvertVssPathToRealPath(rLocalPath, rBackupLocation),
+						nonVssDirPath,
 						strerror(errno));
 				}
 				
 				// Report the error (logs and eventual email
 				// to administrator)
-				SetErrorWhenReadingFilesystemObject(rParams, rLocalPath);
+				SetErrorWhenReadingFilesystemObject(rParams,
+					nonVssDirPath);
 				// Ignore this directory for now.
 				return;
 			}
@@ -1066,7 +1068,9 @@
 				try
 				{
 					latestObjectID = UploadFile(rParams,
-						filename, storeFilename,
+						filename,
+						nonVssFilePath,
+						storeFilename,
 						fileSize, modTime,
 						attributesHash,
 						noPreviousVersionOnServer);
@@ -1608,6 +1612,7 @@
 int64_t BackupClientDirectoryRecord::UploadFile(
 	BackupClientDirectoryRecord::SyncParams &rParams,
 	const std::string &rFilename,
+	const std::string &rNonVssFilePath,
 	const BackupStoreFilename &rStoreFilename,
 	int64_t FileSize,
 	box_time_t ModificationTime,
@@ -1641,8 +1646,8 @@
 			if(diffFromID != 0)
 			{
 				// Found an old version
-				rNotifier.NotifyFileUploadingPatch(this, 
-					rFilename);
+				rNotifier.NotifyFileUploadingPatch(this,
+					rNonVssFilePath);
 
 				// Get the index
 				std::auto_ptr<IOStream> blockIndexStream(connection.ReceiveStream());
@@ -1701,7 +1706,7 @@
 		if(doNormalUpload)
 		{
 			// below threshold or nothing to diff from, so upload whole
-			rNotifier.NotifyFileUploading(this, rFilename);
+			rNotifier.NotifyFileUploading(this, rNonVssFilePath);
 			
 			// Prepare to upload, getting a stream which will encode the file as we go along
 			std::auto_ptr<IOStream> upload(
@@ -1762,7 +1767,7 @@
 					return 0;
 				}
 				rNotifier.NotifyFileUploadServerError(this,
-					rFilename, type, subtype);
+					rNonVssFilePath, type, subtype);
 			}
 		}
 		
@@ -1770,7 +1775,8 @@
 		throw;
 	}
 
-	rNotifier.NotifyFileUploaded(this, rFilename, FileSize, uploadedSize);
+	rNotifier.NotifyFileUploaded(this, rNonVssFilePath, FileSize,
+		uploadedSize);
 
 	// Return the new object ID of this file
 	return objID;

Modified: box/trunk/bin/bbackupd/BackupClientDirectoryRecord.h
===================================================================
--- box/trunk/bin/bbackupd/BackupClientDirectoryRecord.h	2011-10-25 22:03:07 UTC (rev 3030)
+++ box/trunk/bin/bbackupd/BackupClientDirectoryRecord.h	2011-10-25 22:27:56 UTC (rev 3031)
@@ -156,6 +156,7 @@
 		const std::vector<std::string> &rDirs);
 	int64_t UploadFile(SyncParams &rParams,
 		const std::string &rFilename,
+		const std::string &rNonVssFilePath,
 		const BackupStoreFilename &rStoreFilename,
 		int64_t FileSize, box_time_t ModificationTime,
 		box_time_t AttributesHash, bool NoPreviousVersionOnServer);