Changeset 2262 for box/trunk/bin/bbstored/BackupStoreDaemon.cpp

Timestamp:

21/08/2008 12:18:39 (4 years ago)

Author:

chris

Message:

Run housekeeping synchronously on all platforms if daemon is run in
single process mode (-D), not just on Windows.

Add a housekeeping interface to allow Boxi to run housekeeping.

File:

• box/trunk/bin/bbstored/BackupStoreDaemon.cpp (modified) (2 diffs)

box/trunk/bin/bbstored/BackupStoreDaemon.cpp

@@ -173 +173 @@
         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)
+        // Fork off housekeeping daemon -- must only do this the first
+        // time Run() is called.  Housekeeping runs synchronously on Win32
+        // because IsSingleProcess() is always true
+        
+#ifndef WIN32
+        if(!IsSingleProcess() && !mHaveForkedHousekeeping)
         {
                 // Open a socket pair for communication
@@ -207 +208 @@
                                 BOX_INFO("Housekeeping process started");
                                 // Ignore term and hup
-                                // Parent will handle these and alert the child via the socket, don't want to randomly die
+                                // Parent will handle these and alert the
+                                // child via the socket, don't want to
+                                // randomly die!
                                 ::signal(SIGHUP, SIG_IGN);
                                 ::signal(SIGTERM, SIG_IGN);