*
*/
-#ifdef DLL_EXPORT
-#define IN_LIBCIT
-#endif
-
#include "sysdep.h"
#include <stdlib.h>
#include <unistd.h>
#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"
#include "sysdep_decls.h"
#include "room_ops.h"
#include "database.h"
-
-
-
+#include "msgbase.h"
+#include "journaling.h"
/*
* Terminate idle sessions. This function pounds through the session table
if ((ScheduledShutdown == 1) && (ContextList == NULL)) {
lprintf(CTDL_NOTICE, "Scheduled shutdown initiating.\n");
time_to_die = 1;
+ master_cleanup(0);
}
}
flbuf.f_flags = flbuf.f_flags & ~QR_INUSE;
}
lputfloor(&flbuf, a);
- lprintf(9, "Floor %d: %d rooms\n", a, new_refcounts[a]);
+ lprintf(CTDL_DEBUG, "Floor %d: %d rooms\n", a, new_refcounts[a]);
}
}
static int housekeeping_in_progress = 0;
static time_t last_timer = 0L;
int do_housekeeping_now = 0;
+ int do_perminute_housekeeping_now = 0;
time_t now;
/*
* potentially have multiple concurrent mutexes in progress.
*/
begin_critical_section(S_HOUSEKEEPING);
- now = time(NULL);
- if ( (now - last_timer) > (time_t)60 ) {
- if (housekeeping_in_progress == 0) {
- do_housekeeping_now = 1;
- housekeeping_in_progress = 1;
+ if (housekeeping_in_progress == 0) {
+ do_housekeeping_now = 1;
+ housekeeping_in_progress = 1;
+ now = time(NULL);
+ if ( (now - last_timer) > (time_t)60 ) {
+ do_perminute_housekeeping_now = 1;
last_timer = time(NULL);
}
}
* loop. Everything below this point is real work.
*/
- cdb_check_handles(); /* suggested by Justin Case */
- PerformSessionHooks(EVT_TIMER); /* Run any timer hooks */
+ /* First, do the "as often as needed" stuff... */
+ JournalRunQueue();
+
+ PerformSessionHooks(EVT_HOUSE); /* perform as needed housekeeping */
+
+ /* Then, do the "once per minute" stuff... */
+ if (do_perminute_housekeeping_now) {
+ cdb_check_handles(); /* suggested by Justin Case */
+ PerformSessionHooks(EVT_TIMER); /* Run any timer hooks */
+ }
/*
* All done.