From 197390f9297bcea50153da7c71e724d649bb9709 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Tue, 7 Feb 2023 19:16:18 -0500 Subject: [PATCH] only throw a warning if housekeeping has not run in 60 minutes, not 5 minutes --- citadel/server/housekeeping.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/citadel/server/housekeeping.c b/citadel/server/housekeeping.c index 6532e092a..8b13b9552 100644 --- a/citadel/server/housekeeping.c +++ b/citadel/server/housekeeping.c @@ -71,7 +71,7 @@ void check_ref_counts(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 + syslog(LOG_DEBUG, "original_brk=%lx, current_brk=%lx, addl=%ld", (long)original_brk, (long)sbrk(0), (long)(sbrk(0)-original_brk)); } @@ -103,8 +103,8 @@ void do_housekeeping(void) { end_critical_section(S_HOUSEKEEPING); now = time(NULL); - if ( (do_housekeeping_now == 0) && (!CtdlIsSingleUser()) ) { - if ( (now - last_timer) > (time_t)300 ) { + if ( (do_housekeeping_now == 0) && (!CtdlIsSingleUser()) && ((now - last_timer) > (time_t)3600) ) { + if ( (now - last_timer) > (time_t)3600 ) { syslog(LOG_WARNING, "housekeeping: WARNING: housekeeping loop has not run for %ld minutes. Is something stuck?", ((now - last_timer) / 60) -- 2.39.2