[Box Backup-commit] COMMIT r1095 - box/chris/merge/bin/bbstored
boxbackup-dev@fluffy.co.uk
boxbackup-dev@fluffy.co.uk
Wed, 18 Oct 2006 20:48:50 +0100
Author: chris
Date: 2006-10-18 20:48:50 +0100 (Wed, 18 Oct 2006)
New Revision: 1095
Modified:
box/chris/merge/bin/bbstored/BackupStoreDaemon.cpp
Log:
Reinstate #ifdefs on Win32. (refs #3)
Modified: box/chris/merge/bin/bbstored/BackupStoreDaemon.cpp
===================================================================
--- box/chris/merge/bin/bbstored/BackupStoreDaemon.cpp 2006-10-18 19:44:20 UTC (rev 1094)
+++ box/chris/merge/bin/bbstored/BackupStoreDaemon.cpp 2006-10-18 19:48:50 UTC (rev 1095)
@@ -42,6 +42,7 @@
mExtendedLogging(false),
mHaveForkedHousekeeping(false),
mIsHousekeepingProcess(false),
+ mHousekeepingInited(false),
mInterProcessComms(mInterProcessCommsSocket)
{
}
@@ -159,6 +160,9 @@
const Configuration &config(GetConfiguration());
mExtendedLogging = config.GetKeyValueBool("ExtendedLogging");
+#ifdef WIN32
+ // Housekeeping runs synchronously on Win32
+#else
// Fork off housekeeping daemon -- must only do this the first time Run() is called
if(!mHaveForkedHousekeeping)
{
@@ -214,6 +218,7 @@
THROW_EXCEPTION(ServerException, SocketCloseError)
}
}
+#endif // WIN32
if(mIsHousekeepingProcess)
{