Changeset 2181 for box/trunk/bin/bbackupd/BackupDaemon.h

Timestamp:

28/05/2008 16:24:05 (4 years ago)

Author:

chris

Message:

Track and log file deletions by name.

Split crypto init and file sync process into its own method, to reduce
call depth and facilitate calling in process from tests.

Differentiate between 3 uses of stat in BackupClientDirectoryRecord? by
renaming the structures.

Use stat instead of lstat when checking the filesystem that's holding an
entity, in case it's a symbolic link to a different filesystem.

File:

• box/trunk/bin/bbackupd/BackupDaemon.h (modified) (5 diffs)

box/trunk/bin/bbackupd/BackupDaemon.h

@@ -15 +15 @@
 #include <memory>
 
+#include "BackupClientDirectoryRecord.h"
 #include "BoxTime.h"
 #include "Daemon.h"
-#include "BackupClientDirectoryRecord.h"
+#include "Logging.h"
 #include "Socket.h"
 #include "SocketListen.h"
 #include "SocketStream.h"
-#include "Logging.h"
+#include "TLSContext.h"
+
 #include "autogen_BackupProtocolClient.h"
 
@@ -53 +55 @@
         // methods below do partial (specialized) serialization of 
         // client state only
-        bool SerializeStoreObjectInfo(int64_t aClientStoreMarker, 
-                box_time_t theLastSyncTime, box_time_t theNextSyncTime) const;
-        bool DeserializeStoreObjectInfo(int64_t & aClientStoreMarker, 
-                box_time_t & theLastSyncTime, box_time_t & theNextSyncTime);
+        bool SerializeStoreObjectInfo(box_time_t theLastSyncTime,
+                box_time_t theNextSyncTime) const;
+        bool DeserializeStoreObjectInfo(box_time_t & theLastSyncTime,
+                box_time_t & theNextSyncTime);
         bool DeleteStoreObjectInfo() const;
         BackupDaemon(const BackupDaemon &);
@@ -112 +114 @@
         void Run2();
 
+public:
+        void InitCrypto();
+        void RunSyncNow();
+
+private:
         void DeleteAllLocations();
         void SetupLocations(BackupClientContext &rClientContext, const Configuration &rLocationsConf);
@@ -206 +213 @@
         std::vector<std::pair<int64_t,std::string> > mUnusedRootDirEntries;
 
+        int64_t mClientStoreMarker;
+        bool mStorageLimitExceeded;
+        bool mReadErrorsOnFilesystemObjects;
+        box_time_t mLastSyncTime;
+        TLSContext mTlsContext;
+
 public:
         bool StopRun() { return this->Daemon::StopRun(); }
+        bool StorageLimitExceeded() { return mStorageLimitExceeded; }
  
 private:
@@ -428 +442 @@
                 } 
         }
+        virtual void NotifyDirectoryDeleted(
+                int64_t ObjectID,
+                const std::string& rRemotePath)
+        {
+                if (mLogAllFileAccess)
+                {
+                        BOX_NOTICE("Deleted directory: " << rRemotePath << 
+                                " (ID " << BOX_FORMAT_OBJECTID(ObjectID) <<
+                                ")");
+                }
+        }
+        virtual void NotifyFileDeleted(
+                int64_t ObjectID,
+                const std::string& rRemotePath)
+        {
+                if (mLogAllFileAccess)
+                {
+                        BOX_NOTICE("Deleted file: " << rRemotePath << 
+                                " (ID " << BOX_FORMAT_OBJECTID(ObjectID) <<
+                                ")");
+                }
+        }
 
 #ifdef WIN32