Fix directory permission checks

[citadel.git] / citadel / housekeeping.c

diff --git a/citadel/housekeeping.c b/citadel/housekeeping.c
index 9cce884473a0426b51cfd3ebc9c054b4c2cfc128..11be04e0092133b4cbee41498bce0abfe67cec04 100644 (file)
--- a/citadel/housekeeping.c
+++ b/citadel/housekeeping.c
@@ -4,66 +4,27 @@
  * 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");
-               CtdlThreadStopAll();
+               server_shutting_down = 1;
        }
 }
 
@@ -117,13 +78,12 @@ 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;
-       const char *old_name;
 
        /*
         * We do it this way instead of wrapping the whole loop in an
@@ -134,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);
 
@@ -151,23 +106,26 @@ 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... */
-       old_name = CtdlThreadName("House Keeping - Journal");
        JournalRunQueue();
-
-       CtdlThreadName("House Keeping - EVT_HOUSE");
-       PerformSessionHooks(EVT_HOUSE); /* perform as needed housekeeping */
+       PerformSessionHooks(EVT_HOUSE);
 
        /* Then, do the "once per minute" stuff... */
        if (do_perminute_housekeeping_now) {
                cdb_check_handles();                    /* suggested by Justin Case */
-               CtdlThreadName("House Keeping - EVT_TIMER");
                PerformSessionHooks(EVT_TIMER);         /* Run any timer hooks */
        }
 
        /*
         * All done.
         */
+       begin_critical_section(S_HOUSEKEEPING);
        housekeeping_in_progress = 0;
-       CtdlThreadName(old_name);
+       end_critical_section(S_HOUSEKEEPING);
 }