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

[subversion at boxbackup.org]

Author: chris
Date: 2014-12-10 23:44:04 +0000 (Wed, 10 Dec 2014)
New Revision: 3457

Modified:
   box/trunk/bin/bbackupd/BackupDaemon.cpp
Log:
Fix an unnecessary pass through backup loop when time for next backup arrives.


Modified: box/trunk/bin/bbackupd/BackupDaemon.cpp
===================================================================
--- box/trunk/bin/bbackupd/BackupDaemon.cpp	2014-12-10 23:39:29 UTC (rev 3456)
+++ box/trunk/bin/bbackupd/BackupDaemon.cpp	2014-12-10 23:44:04 UTC (rev 3457)
@@ -627,6 +627,9 @@
 				? 1 : sleepSeconds);
 		}
 
+		// We have now slept, so if automaticBackup is enabled then
+		// it's time for a backup now.
+
 		if(StopRun())
 		{
 			BOX_INFO("Stopping idle loop due to shutdown request");
@@ -637,12 +640,6 @@
 			BOX_INFO("Starting a backup immediately due to "
 				"bbackupctl sync command");
 		}
-		else if(currentTime < mNextSyncTime)
-		{
-			BOX_TRACE("Sleeping again because next sync time "
-				"has not arrived");
-			continue;
-		}
 		else if(mDoSyncForcedByPreviousSyncError)
 		{
 			BOX_INFO("Last backup was not successful, next one "