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()).

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"));