diff options
| author | Chris Wilson <chris+github@qwirx.com> | 2008-09-26 20:26:20 +0000 |
|---|---|---|
| committer | Chris Wilson <chris+github@qwirx.com> | 2008-09-26 20:26:20 +0000 |
| commit | cc17fe1a45f2dd75dea965ec57f1c1c2b1b9223b (patch) | |
| tree | a7aeabbccccc8300ce579b79ff1fed9a123630a8 /bin | |
| parent | fe190dd503c06436f63c54e4c44bcec12dfc60ae (diff) | |
Make upload decision messages (logged with LogAllFileAccess) clearer
to help automated log processing.
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/bbackupd/BackupClientDirectoryRecord.cpp | 42 |
1 files changed, 31 insertions, 11 deletions
diff --git a/bin/bbackupd/BackupClientDirectoryRecord.cpp b/bin/bbackupd/BackupClientDirectoryRecord.cpp index d43155a2..82695a71 100644 --- a/bin/bbackupd/BackupClientDirectoryRecord.cpp +++ b/bin/bbackupd/BackupClientDirectoryRecord.cpp @@ -839,13 +839,15 @@ bool BackupClientDirectoryRecord::UpdateItems( if (pDirOnStore != 0 && en == 0) { doUpload = true; - BOX_TRACE(filename << ": will upload " + BOX_TRACE("Upload decision: " << + filename << ": will upload " "(not on server)"); } else if (modTime >= rParams.mSyncPeriodStart) { doUpload = true; - BOX_TRACE(filename << ": will upload " + BOX_TRACE("Upload decision: " << + filename << ": will upload " "(modified since last sync)"); } } @@ -863,7 +865,8 @@ bool BackupClientDirectoryRecord::UpdateItems( > rParams.mMaxUploadWait) { doUpload = true; - BOX_TRACE(filename << ": will upload " + BOX_TRACE("Upload decision: " << + filename << ": will upload " "(continually modified)"); } @@ -880,7 +883,8 @@ bool BackupClientDirectoryRecord::UpdateItems( en->GetModificationTime() != modTime) { doUpload = true; - BOX_TRACE(filename << ": will upload " + BOX_TRACE("Upload decision: " << + filename << ": will upload " "(mod time changed)"); } @@ -892,23 +896,39 @@ bool BackupClientDirectoryRecord::UpdateItems( rParams.mUploadAfterThisTimeInTheFuture) { doUpload = true; - BOX_TRACE(filename << ": will upload " + BOX_TRACE("Upload decision: " << + filename << ": will upload " "(mod time in the future)"); } } if (en != 0 && en->GetModificationTime() == modTime) { - BOX_TRACE(filename << ": will not upload " + BOX_TRACE("Upload decision: " << + filename << ": will not upload " "(not modified since last upload)"); } else if (!doUpload) { - BOX_TRACE(filename << ": will not upload " - "(mod time is " << modTime << - " which is outside sync window, " - << rParams.mSyncPeriodStart << " to " - << rParams.mSyncPeriodEnd << ")"); + if (modTime > rParams.mSyncPeriodEnd) + { + box_time_t now = GetCurrentBoxTime(); + int age = BoxTimeToSeconds(now - + modTime); + BOX_TRACE("Upload decision: " << + filename << ": will not upload " + "(modified too recently: " + "only " << age << "seconds ago)"); + } + else + { + BOX_TRACE("Upload decision: " << + filename << ": will not upload " + "(mod time is " << modTime << + " which is outside sync window, " + << rParams.mSyncPeriodStart << " to " + << rParams.mSyncPeriodEnd << ")"); + } } bool fileSynced = true; |