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

[boxbackup-dev at fluffy.co.uk]

Author: chris
Date: 2008-09-26 21:26:20 +0100 (Fri, 26 Sep 2008)
New Revision: 2301

Modified:
   box/trunk/bin/bbackupd/BackupClientDirectoryRecord.cpp
Log:
Make upload decision messages (logged with LogAllFileAccess) clearer
to help automated log processing.


Modified: box/trunk/bin/bbackupd/BackupClientDirectoryRecord.cpp
===================================================================
--- box/trunk/bin/bbackupd/BackupClientDirectoryRecord.cpp	2008-09-26 20:25:01 UTC (rev 2300)
+++ box/trunk/bin/bbackupd/BackupClientDirectoryRecord.cpp	2008-09-26 20:26:20 UTC (rev 2301)
@@ -839,13 +839,15 @@
 				if (pDirOnStore != 0 && en == 0)
 				{
 					doUpload = true;
-					BOX_TRACE(filename << ": will upload "
+					BOX_TRACE("Upload decision: " <<
+						filename << ": will upload "
 						"(not on server)");
 				}
 				else if (modTime >= rParams.mSyncPeriodStart)
 				{
 					doUpload = true;
-					BOX_TRACE(filename << ": will upload "
+					BOX_TRACE("Upload decision: " <<
+						filename << ": will upload "
 						"(modified since last sync)");
 				}
 			}
@@ -863,7 +865,8 @@
 				> rParams.mMaxUploadWait)
 			{
 				doUpload = true;
-				BOX_TRACE(filename << ": will upload "
+				BOX_TRACE("Upload decision: " <<
+					filename << ": will upload "
 					"(continually modified)");
 			}
 
@@ -880,7 +883,8 @@
 				en->GetModificationTime() != modTime)
 			{
 				doUpload = true;
-				BOX_TRACE(filename << ": will upload "
+				BOX_TRACE("Upload decision: " <<
+					filename << ": will upload "
 					"(mod time changed)");
 			}
 
@@ -892,23 +896,39 @@
 				rParams.mUploadAfterThisTimeInTheFuture)
 			{
 				doUpload = true;
-				BOX_TRACE(filename << ": will upload "
+				BOX_TRACE("Upload decision: " <<
+					filename << ": will upload "
 					"(mod time in the future)");
 			}
 		}
 	
 		if (en != 0 && en->GetModificationTime() == modTime)
 		{
-			BOX_TRACE(filename << ": will not upload "
+			BOX_TRACE("Upload decision: " <<
+				filename << ": will not upload "
 				"(not modified since last upload)");
 		}
 		else if (!doUpload)
 		{
-			BOX_TRACE(filename << ": will not upload "
-				"(mod time is " << modTime << 
-				" which is outside sync window, "
-				<< rParams.mSyncPeriodStart << " to "
-				<< rParams.mSyncPeriodEnd << ")");
+			if (modTime > rParams.mSyncPeriodEnd)
+			{
+				box_time_t now = GetCurrentBoxTime();
+				int age = BoxTimeToSeconds(now -
+					modTime);
+				BOX_TRACE("Upload decision: " <<
+					filename << ": will not upload "
+					"(modified too recently: "
+					"only " << age << "seconds ago)");
+			}
+			else
+			{
+				BOX_TRACE("Upload decision: " <<
+					filename << ": will not upload "
+					"(mod time is " << modTime << 
+					" which is outside sync window, "
+					<< rParams.mSyncPeriodStart << " to "
+					<< rParams.mSyncPeriodEnd << ")");
+			}
 		}
 
 		bool fileSynced = true;