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

subversion at boxbackup.org subversion at boxbackup.org
Fri Dec 12 23:24:32 GMT 2014


Author: chris
Date: 2014-12-12 23:24:32 +0000 (Fri, 12 Dec 2014)
New Revision: 3460

Modified:
   box/trunk/bin/bbackupd/BackupDaemon.cpp
Log:
Don't stop waiitng until the deadline has actually expired.


Modified: box/trunk/bin/bbackupd/BackupDaemon.cpp
===================================================================
--- box/trunk/bin/bbackupd/BackupDaemon.cpp	2014-12-12 23:24:04 UTC (rev 3459)
+++ box/trunk/bin/bbackupd/BackupDaemon.cpp	2014-12-12 23:24:32 UTC (rev 3460)
@@ -640,22 +640,27 @@
 			BOX_INFO("Starting a backup immediately due to "
 				"bbackupctl sync command");
 		}
+		else if(GetCurrentBoxTime() < mNextSyncTime)
+		{
+			BOX_TRACE("Deadline not reached, sleeping again");
+			continue;
+		}
 		else if(mDoSyncForcedByPreviousSyncError)
 		{
 			BOX_INFO("Last backup was not successful, next one "
 				"starting now");
 		}
-		else if(automaticBackup)
+		else if(!automaticBackup)
 		{
-			BOX_INFO("Automatic backups are enabled, next one "
-				"starting now");
-		}
-		else
-		{
 			BOX_TRACE("Sleeping again because automatic backups "
 				"are not enabled");
 			continue;
 		}
+		else
+		{
+			BOX_INFO("Automatic backups are enabled, next one "
+				"starting now");
+		}
 
 		// If we pass this point, or exit the loop, we should have
 		// logged something at INFO level or higher to explain why.




More information about the Boxbackup-commit mailing list