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

[subversion at boxbackup.org]

Author: chris
Date: 2012-04-28 19:19:53 +0100 (Sat, 28 Apr 2012)
New Revision: 3102

Modified:
   box/trunk/bin/bbackupd/BackupDaemon.cpp
   box/trunk/bin/bbackupd/BackupDaemon.h
Log:
Allow BackupDaemon user to reset state for testing.


Modified: box/trunk/bin/bbackupd/BackupDaemon.cpp
===================================================================
--- box/trunk/bin/bbackupd/BackupDaemon.cpp	2012-04-28 18:18:59 UTC (rev 3101)
+++ box/trunk/bin/bbackupd/BackupDaemon.cpp	2012-04-28 18:19:53 UTC (rev 3102)
@@ -721,12 +721,7 @@
 			DeleteCorruptBerkelyDbFiles();
 		}
 
-		// Clear state data
-		// Go back to beginning of time
-		mLastSyncTime = 0;
-		mClientStoreMarker = BackupClientContext::ClientStoreMarker_NotKnown;	// no store marker, so download everything
-		DeleteAllLocations();
-		DeleteAllIDMaps();
+		ResetCachedState();
 
 		// Handle restart?
 		if(StopRun())
@@ -789,6 +784,16 @@
 	OnBackupFinish();
 }
 
+void BackupDaemon::ResetCachedState()
+{
+	// Clear state data
+	// Go back to beginning of time
+	mLastSyncTime = 0;
+	mClientStoreMarker = BackupClientContext::ClientStoreMarker_NotKnown;	// no store marker, so download everything
+	DeleteAllLocations();
+	DeleteAllIDMaps();
+}
+
 void BackupDaemon::RunSyncNow()
 {
 	// Delete the serialised store object file,

Modified: box/trunk/bin/bbackupd/BackupDaemon.h
===================================================================
--- box/trunk/bin/bbackupd/BackupDaemon.h	2012-04-28 18:18:59 UTC (rev 3101)
+++ box/trunk/bin/bbackupd/BackupDaemon.h	2012-04-28 18:19:53 UTC (rev 3102)
@@ -117,6 +117,7 @@
 	void InitCrypto();
 	void RunSyncNowWithExceptionHandling();
 	void RunSyncNow();
+	void ResetCachedState();
 	void OnBackupStart();
 	void OnBackupFinish();
 	// TouchFileInWorkingDir is only here for use by Boxi.