Added a comma after each msgnum exported. The parser was globbing them all together...

[citadel.git] / citadel / housekeeping.c

diff --git a/citadel/housekeeping.c b/citadel/housekeeping.c
index 7f49ad928e5bfdd9b78905d8420b3af32c99d64f..0ca383202c2bb1f27275e2d92cedb5f7d5a860f5 100644 (file)
--- a/citadel/housekeeping.c
+++ b/citadel/housekeeping.c
@@ -1,7 +1,7 @@
 /*
  * This file contains miscellaneous housekeeping tasks.
  *
- * Copyright (c) 1987-2018 by the citadel.org team
+ * Copyright (c) 1987-2021 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.
@@ -78,8 +78,7 @@ void check_ref_counts(void) {
 /*
  * Provide hints as to whether we have any memory leaks
  */
-void keep_an_eye_on_memory_usage(void)
-{
+void keep_an_eye_on_memory_usage(void) {
        static void *original_brk = NULL;
        if (!original_brk) original_brk = sbrk(0);      // Remember the original program break so we can test for leaks
        syslog(LOG_DEBUG, "original_brk=%lx, current_brk=%lx, addl=%ld", (long)original_brk, (long)sbrk(0), (long)(sbrk(0)-original_brk));      // FIXME not so noisy please
@@ -112,7 +111,7 @@ void do_housekeeping(void) {
        end_critical_section(S_HOUSEKEEPING);
 
        now = time(NULL);
-       if (do_housekeeping_now == 0) {
+       if ( (do_housekeeping_now == 0) && (!CtdlIsSingleUser()) ) {
                if ( (now - last_timer) > (time_t)300 ) {
                        syslog(LOG_WARNING,
                                "housekeeping: WARNING: housekeeping loop has not run for %ld minutes.  Is something stuck?",
@@ -161,8 +160,7 @@ void do_housekeeping(void) {
 }
 
 
-void CtdlDisableHouseKeeping(void)
-{
+void CtdlDisableHouseKeeping(void) {
        int ActiveBackgroundJobs;
        int do_housekeeping_now = 0;
        struct CitContext *nptr;
@@ -212,8 +210,7 @@ retry_wait_for_contexts:
 }
 
 
-void CtdlEnableHouseKeeping(void)
-{
+void CtdlEnableHouseKeeping(void) {
        begin_critical_section(S_HOUSEKEEPING);
        housekeeping_in_progress = 0;
        end_critical_section(S_HOUSEKEEPING);