diff options
| author | Chris Wilson <chris+github@qwirx.com> | 2014-04-18 08:56:01 +0000 |
|---|---|---|
| committer | Chris Wilson <chris+github@qwirx.com> | 2014-04-18 08:56:01 +0000 |
| commit | 468296533343bbeed92864513012f7f4371aefb7 (patch) | |
| tree | 01740553bb8e2fd1d101993f8cb21d14aac0adb9 /bin/bbackupd/BackupDaemon.cpp | |
| parent | 8a653921349ccc9af5203749954efd795b62c5b6 (diff) | |
Simplify the sync start logic some more, log when force-sync overrides script.
Diffstat (limited to 'bin/bbackupd/BackupDaemon.cpp')
| -rw-r--r-- | bin/bbackupd/BackupDaemon.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/bin/bbackupd/BackupDaemon.cpp b/bin/bbackupd/BackupDaemon.cpp index b8fcd541..893b12fb 100644 --- a/bin/bbackupd/BackupDaemon.cpp +++ b/bin/bbackupd/BackupDaemon.cpp @@ -667,7 +667,12 @@ void BackupDaemon::Run2() // 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) |