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

subversion at boxbackup.org subversion at boxbackup.org
Fri Apr 18 09:56:02 BST 2014


Author: chris
Date: 2014-04-18 09:56:01 +0100 (Fri, 18 Apr 2014)
New Revision: 3337

Modified:
   box/trunk/bin/bbackupd/BackupDaemon.cpp
Log:
Simplify the sync start logic some more, log when force-sync overrides script.

Modified: box/trunk/bin/bbackupd/BackupDaemon.cpp
===================================================================
--- box/trunk/bin/bbackupd/BackupDaemon.cpp	2014-04-18 08:47:38 UTC (rev 3336)
+++ box/trunk/bin/bbackupd/BackupDaemon.cpp	2014-04-18 08:56:01 UTC (rev 3337)
@@ -667,8 +667,13 @@
 		// logged something at INFO level or higher to explain why.
 
 		// Use a script to see if sync is allowed now?
-		if(!mDoSyncForcedByCommand && doSync && !StopRun())
+		if(mDoSyncForcedByCommand)
 		{
+			BOX_INFO("Skipping SyncAllowScript due to bbackupctl "
+				"force-sync command");
+		}
+		else
+		{
 			int d = UseScriptToSeeIfSyncAllowed();
 			if(d > 0)
 			{




More information about the Boxbackup-commit mailing list