diff options
| -rw-r--r-- | bin/bbackupd/BackupClientDirectoryRecord.cpp | 3 | ||||
| -rw-r--r-- | bin/bbackupd/BackupDaemon.cpp | 8 | ||||
| -rw-r--r-- | bin/bbackupd/BackupDaemon.h | 17 | ||||
| -rw-r--r-- | bin/bbackupd/BackupDaemonInterface.h | 4 |
4 files changed, 30 insertions, 2 deletions
diff --git a/bin/bbackupd/BackupClientDirectoryRecord.cpp b/bin/bbackupd/BackupClientDirectoryRecord.cpp index f72903df..b5c9fbcd 100644 --- a/bin/bbackupd/BackupClientDirectoryRecord.cpp +++ b/bin/bbackupd/BackupClientDirectoryRecord.cpp @@ -1387,6 +1387,9 @@ bool BackupClientDirectoryRecord::UpdateItems( // Flag as having done this for optimisation later haveJustCreatedDirOnServer = true; + rNotifier.NotifyDirectoryCreated(subDirObjectID, + storeFilename.GetClearFilename(), + dirname); } } diff --git a/bin/bbackupd/BackupDaemon.cpp b/bin/bbackupd/BackupDaemon.cpp index 914a2517..ccc52b8a 100644 --- a/bin/bbackupd/BackupDaemon.cpp +++ b/bin/bbackupd/BackupDaemon.cpp @@ -189,6 +189,8 @@ BackupDaemon::BackupDaemon() mUpdateStoreInterval(0), mDeleteStoreObjectInfoFile(false), mDoSyncForcedByPreviousSyncError(false), + mNumFilesUploaded(-1), + mNumDirsCreated(-1), mLogAllFileAccess(false), mpProgressNotifier(this), mpLocationResolver(this), @@ -917,6 +919,8 @@ void BackupDaemon::RunSyncNow() conf.GetKeyValueInt("DiffingUploadSizeThreshold"); params.mMaxFileTimeInFuture = SecondsToBoxTime(conf.GetKeyValueInt("MaxFileTimeInFuture")); + mNumFilesUploaded = 0; + mNumDirsCreated = 0; if(conf.KeyExists("MaxUploadRate")) { @@ -1631,7 +1635,9 @@ void BackupDaemon::OnBackupFinish() << ", bytes already on server " << BackupStoreFile::msStats.mBytesAlreadyOnServer << ", encoded size " - << BackupStoreFile::msStats.mTotalFileStreamSize); + << BackupStoreFile::msStats.mTotalFileStreamSize + << ", " << mNumFilesUploaded << " files uploaded, " + << mNumDirsCreated << " dirs created"); // Reset statistics again BackupStoreFile::ResetStats(); diff --git a/bin/bbackupd/BackupDaemon.h b/bin/bbackupd/BackupDaemon.h index ecd2370b..23172f00 100644 --- a/bin/bbackupd/BackupDaemon.h +++ b/bin/bbackupd/BackupDaemon.h @@ -235,6 +235,7 @@ private: TLSContext mTlsContext; bool mDeleteStoreObjectInfoFile; bool mDoSyncForcedByPreviousSyncError; + int64_t mNumFilesUploaded, mNumDirsCreated; public: bool StopRun() { return this->Daemon::StopRun(); } @@ -477,7 +478,8 @@ public: BOX_NOTICE("Uploaded file: " << rLocalPath << ", " "total size = " << FileSize << ", " "uploaded size = " << UploadedSize); - } + } + mNumFilesUploaded++; } virtual void NotifyFileSynchronised( const BackupClientDirectoryRecord* pDirRecord, @@ -489,6 +491,19 @@ public: BOX_INFO("Synchronised file: " << rLocalPath); } } + virtual void NotifyDirectoryCreated( + int64_t ObjectID, + const std::string& rLocalPath, + const std::string& rRemotePath) + { + if (mLogAllFileAccess) + { + BOX_NOTICE("Created directory: " << rRemotePath << + " (ID " << BOX_FORMAT_OBJECTID(ObjectID) << + ")"); + } + mNumDirsCreated++; + } virtual void NotifyDirectoryDeleted( int64_t ObjectID, const std::string& rRemotePath) diff --git a/bin/bbackupd/BackupDaemonInterface.h b/bin/bbackupd/BackupDaemonInterface.h index b603273c..a847b264 100644 --- a/bin/bbackupd/BackupDaemonInterface.h +++ b/bin/bbackupd/BackupDaemonInterface.h @@ -134,6 +134,10 @@ class ProgressNotifier const BackupClientDirectoryRecord* pDirRecord, const std::string& rLocalPath, int64_t FileSize) = 0; + virtual void NotifyDirectoryCreated( + int64_t ObjectID, + const std::string& rLocalPath, + const std::string& rRemotePath) = 0; virtual void NotifyDirectoryDeleted( int64_t ObjectID, const std::string& rRemotePath) = 0; |