diff options
author | Chris Wilson <chris+github@qwirx.com> | 2014-11-23 22:01:27 +0000 |
---|---|---|
committer | Chris Wilson <chris+github@qwirx.com> | 2014-11-23 22:01:27 +0000 |
commit | 3621d57a95b858236921d8a9a22fb7568e451dc7 (patch) | |
tree | 5ad3efdc9a01b81486703e001030fbcdae91b535 /bin | |
parent | 21413fad9f0f0987f486652cb31c1f0f45a71fb6 (diff) |
Fix compile errors introduced by previous commit.
Add a LogFileOverwrite option to allow configuring whether LogFile is
overwritten or appended to. Overwriting happens at startup, and the start
of each backup in bbackupd (via ResetLogFile()).
Diffstat (limited to 'bin')
-rw-r--r-- | bin/bbackupd/BackupDaemon.cpp | 9 | ||||
-rw-r--r-- | bin/bbackupquery/bbackupquery.cpp | 3 |
2 files changed, 10 insertions, 2 deletions
diff --git a/bin/bbackupd/BackupDaemon.cpp b/bin/bbackupd/BackupDaemon.cpp index 79482e21..7ed5222f 100644 --- a/bin/bbackupd/BackupDaemon.cpp +++ b/bin/bbackupd/BackupDaemon.cpp @@ -874,14 +874,21 @@ std::auto_ptr<BackupClientContext> BackupDaemon::RunSyncNow() if (conf.KeyExists("LogFile")) { + bool overwrite = false; + if (conf.KeyExists("LogFileOverwrite")) + { + overwrite = conf.GetKeyValueBool("LogFileOverwrite"); + } + Log::Level level = Log::INFO; if (conf.KeyExists("LogFileLevel")) { level = Logging::GetNamedLevel( conf.GetKeyValue("LogFileLevel")); } + fileLogger.reset(new FileLogger(conf.GetKeyValue("LogFile"), - level)); + level, !overwrite)); } std::string extendedLogFile; diff --git a/bin/bbackupquery/bbackupquery.cpp b/bin/bbackupquery/bbackupquery.cpp index 62315b12..e10c48fe 100644 --- a/bin/bbackupquery/bbackupquery.cpp +++ b/bin/bbackupquery/bbackupquery.cpp @@ -309,7 +309,8 @@ int main(int argc, const char *argv[]) std::auto_ptr<FileLogger> fileLogger; if (fileLogLevel != Log::INVALID) { - fileLogger.reset(new FileLogger(fileLogFile, fileLogLevel)); + fileLogger.reset(new FileLogger(fileLogFile, fileLogLevel, + true)); // open in append mode } BOX_NOTICE(BANNER_TEXT("Backup Query Tool")); |