X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fhousekeeping.c;h=92336277733acaaeaab8a0bd9145dfeea0cf7ee6;hb=cbc736c6fd45401b653454914a1b437050600a00;hp=99f0d792fa764e6ba488d1b003aa33885b127b75;hpb=744c57519f693b69cd2f5b602f26ba209bdf53ab;p=citadel.git

diff --git a/citadel/housekeeping.c b/citadel/housekeeping.c
index 99f0d792f..923362777 100644
--- a/citadel/housekeeping.c
+++ b/citadel/housekeeping.c
@@ -1,87 +1,30 @@
 /*
- * $Id$
- *
  * This file contains miscellaneous housekeeping tasks.
  *
+ * Copyright (c) 1987-2011 by the citadel.org team
+ *
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  */
 
-#include "sysdep.h"
-#include <stdlib.h>
-#include <unistd.h>
 #include <stdio.h>
-#include <fcntl.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
-#include <ctype.h>
-#include <string.h>
-#include <errno.h>
-#include <limits.h>
-#include <sys/types.h>
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-#include "tools.h"
-#include "citadel.h"
-#include "server.h"
+#include <libcitadel.h>
+
+#include "ctdl_module.h"
 #include "serv_extensions.h"
-#include "citserver.h"
-#include "config.h"
-#include "housekeeping.h"
-#include "sysdep_decls.h"
 #include "room_ops.h"
-#include "database.h"
-#include "msgbase.h"
+#include "internet_addressing.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
- * idle session is found it is terminated, then the search restarts at the
- * beginning because the pointer to our place in the list becomes invalid.
- */
-void terminate_idle_sessions(void) {
-	struct CitContext *ccptr;
-	time_t now;
-	int session_to_kill;
-	int killed = 0;
-
-	now = time(NULL);
-	session_to_kill = 0;
-	begin_critical_section(S_SESSION_TABLE);
-	for (ccptr = ContextList; ccptr != NULL; ccptr = ccptr->next) {
-		if (  (ccptr!=CC)
-	   	&& (config.c_sleeping > 0)
-	   	&& (now - (ccptr->lastcmd) > config.c_sleeping) ) {
-			ccptr->kill_me = 1;
-			++killed;
-		}
-	}
-	end_critical_section(S_SESSION_TABLE);
-	if (killed > 0)
-		lprintf(CTDL_INFO, "Terminated %d idle sessions\n", killed);
-}
-
-
-
 void check_sched_shutdown(void) {
 	if ((ScheduledShutdown == 1) && (ContextList == NULL)) {
-		lprintf(CTDL_NOTICE, "Scheduled shutdown initiating.\n");
-		time_to_die = 1;
-		master_cleanup(0);
+		syslog(LOG_NOTICE, "Scheduled shutdown initiating.\n");
+		server_shutting_down = 1;
 	}
 }
 
@@ -106,13 +49,13 @@ void check_ref_counts(void) {
 
 	int new_refcounts[MAXFLOORS];
 
-	lprintf(CTDL_DEBUG, "Checking floor reference counts\n");
+	syslog(LOG_DEBUG, "Checking floor reference counts\n");
 	for (a=0; a<MAXFLOORS; ++a) {
 		new_refcounts[a] = 0;
 	}
 
 	cdb_begin_transaction();
-	ForEachRoom(check_ref_counts_backend, (void *)new_refcounts );
+	CtdlForEachRoom(check_ref_counts_backend, (void *)new_refcounts );
 	cdb_end_transaction();
 
 	for (a=0; a<MAXFLOORS; ++a) {
@@ -125,7 +68,7 @@ void check_ref_counts(void) {
 			flbuf.f_flags = flbuf.f_flags & ~QR_INUSE;
 		}
 		lputfloor(&flbuf, a);
-		lprintf(CTDL_DEBUG, "Floor %d: %d rooms\n", a, new_refcounts[a]);
+		syslog(LOG_DEBUG, "Floor %d: %d rooms\n", a, new_refcounts[a]);
 	}
 }	
 
@@ -135,9 +78,9 @@ void check_ref_counts(void) {
  * only allow housekeeping to execute once per minute, and we only allow one
  * instance to run at a time.
  */
+static int housekeeping_in_progress = 0;
+static time_t last_timer = 0L;
 void do_housekeeping(void) {
-	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;
@@ -151,11 +94,6 @@ void do_housekeeping(void) {
 	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);
-		}
 	}
 	end_critical_section(S_HOUSEKEEPING);
 
@@ -168,10 +106,15 @@ void do_housekeeping(void) {
 	 * loop.  Everything below this point is real work.
 	 */
 
+	now = time(NULL);
+	if ( (now - last_timer) > (time_t)60 ) {
+		do_perminute_housekeeping_now = 1;
+		last_timer = time(NULL);
+	}
+
 	/* First, do the "as often as needed" stuff... */
 	JournalRunQueue();
-
-	PerformSessionHooks(EVT_HOUSE);	/* perform as needed housekeeping */
+	PerformSessionHooks(EVT_HOUSE);
 
 	/* Then, do the "once per minute" stuff... */
 	if (do_perminute_housekeeping_now) {
@@ -182,5 +125,64 @@ void do_housekeeping(void) {
 	/*
 	 * All done.
 	 */
+	begin_critical_section(S_HOUSEKEEPING);
+	housekeeping_in_progress = 0;
+	end_critical_section(S_HOUSEKEEPING);
+}
+
+void CtdlDisableHouseKeeping(void)
+{
+	int ActiveBackgroundJobs;
+	int do_housekeeping_now = 0;
+	struct CitContext *nptr;
+	int nContexts, i;
+
+retry_block_housekeeping:
+	syslog(LOG_INFO, "trying to disable housekeeping services");
+	begin_critical_section(S_HOUSEKEEPING);
+	if (housekeeping_in_progress == 0) {
+		do_housekeeping_now = 1;
+		housekeeping_in_progress = 1;
+	}
+	end_critical_section(S_HOUSEKEEPING);
+	if (do_housekeeping_now == 0) {
+		usleep(1000000);
+		goto retry_block_housekeeping;
+	}
+	
+	syslog(LOG_INFO, "checking for running server Jobs");
+
+retry_wait_for_contexts:
+	/* So that we don't keep the context list locked for a long time
+	 * we create a copy of it first
+	 */
+	ActiveBackgroundJobs = 0;
+	nptr = CtdlGetContextArray(&nContexts) ;
+	if (nptr)
+	{
+		for (i=0; i<nContexts; i++) 
+		{
+			if ((nptr[i].state != CON_SYS) || (nptr[i].IO == NULL) || (nptr[i].lastcmd == 0))
+				continue;
+			ActiveBackgroundJobs ++;
+			syslog(LOG_INFO, "Job CC[%d] active; use TERM if you don't want to wait for it",nptr[i].cs_pid);
+		
+		}
+	
+		free(nptr);
+
+	}
+	if (ActiveBackgroundJobs != 0) {
+		syslog(LOG_INFO, "found %d running jobs, need to wait", ActiveBackgroundJobs);
+		usleep(5000000);
+		goto retry_wait_for_contexts;
+	}
+	syslog(LOG_INFO, "Housekeeping disabled now.");
+}
+
+void CtdlEnableHouseKeeping(void)
+{
+	begin_critical_section(S_HOUSEKEEPING);
 	housekeeping_in_progress = 0;
+	end_critical_section(S_HOUSEKEEPING);
 }