Begun implimentation of a really good thread control interface.

[citadel.git] / citadel / housekeeping.c

diff --git a/citadel/housekeeping.c b/citadel/housekeeping.c
index 365eeede3f306119ffa591badfc4cfb1272c04fa..cbc8a1c42c5c70506e2f79bad4b2d75c93d45fff 100644 (file)
--- a/citadel/housekeeping.c
+++ b/citadel/housekeeping.c
@@ -30,7 +30,7 @@
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
-#include "tools.h"
+#include <libcitadel.h>
 #include "citadel.h"
 #include "server.h"
 #include "serv_extensions.h"
@@ -43,10 +43,6 @@
 #include "msgbase.h"
 #include "journaling.h"
 
-#ifdef HAVE_LIBSIEVE
-# include "serv_sieve.h"
-#endif
-
 /*
  * Terminate idle sessions.  This function pounds through the session table
  * comparing the current time to each session's time-of-last-command.  If an
@@ -170,9 +166,10 @@ void do_housekeeping(void) {
 
        /* First, do the "as often as needed" stuff... */
        JournalRunQueue();
-#ifdef HAVE_LIBSIEVE
-       perform_sieve_processing();
-#endif
+
+       PerformSessionHooks(EVT_HOUSE); /* perform as needed housekeeping */
+       
+       ctdl_internal_thread_gc(0);
 
        /* Then, do the "once per minute" stuff... */
        if (do_perminute_housekeeping_now) {