CtdlForEachMessage() don't process message 0

[citadel.git] / citadel / server / housekeeping.c

diff --git a/citadel/server/housekeeping.c b/citadel/server/housekeeping.c
index 55e7e77d68058f1b9b84fcb4a6d1a97ebbeadbfd..5ce28bf8182fd0f9b985191bba4017ea808f4a95 100644 (file)
--- a/citadel/server/housekeeping.c
+++ b/citadel/server/housekeeping.c
@@ -88,7 +88,7 @@ void do_housekeeping(void) {
        int do_perminute_housekeeping_now = 0;
        time_t now;
 
-       if (housekeeping_disabled) {
+       if ( (housekeeping_disabled) || (housekeeping_in_progress) ) {
                return;
        }
 
@@ -113,6 +113,10 @@ void do_housekeeping(void) {
                return;
        }
 
+       if (!do_housekeeping_now) {
+               return;
+       }
+
        // Ok, at this point we've made the decision to run the housekeeping
        // loop.  Everything below this point is real work.