X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fhousekeeping.c;h=92336277733acaaeaab8a0bd9145dfeea0cf7ee6;hb=7c94d5bb68f1c448770d31205ec5ae12bd8a02ed;hp=f4d930d64802631a320086be954b50f409255f58;hpb=2b402dc292b6dcdbc7a3786a6c722e06e3be5ab5;p=citadel.git

diff --git a/citadel/housekeeping.c b/citadel/housekeeping.c
index f4d930d64..923362777 100644
--- a/citadel/housekeeping.c
+++ b/citadel/housekeeping.c
@@ -4,62 +4,23 @@
  * 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 as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#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 <syslog.h>
 #include <libcitadel.h>
-#include "citadel.h"
-#include "server.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"
 
-#include "ctdl_module.h"
-#include "threads.h"
-
 void check_sched_shutdown(void) {
 	if ((ScheduledShutdown == 1) && (ContextList == NULL)) {
 		syslog(LOG_NOTICE, "Scheduled shutdown initiating.\n");
@@ -117,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;
@@ -133,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);
 
@@ -150,6 +106,12 @@ 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);
@@ -163,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);
 }