From cc7713b49e4b79f951386dee1b0882f682e3c9b6 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 13 Sep 2023 09:52:13 +0200 Subject: [PATCH] scheduler/job.c: Merge fix from master for extensive logging Master commit: https://github.com/OpenPrinting/cups/commit/541f72d1cc1 Fixes #604 --- CHANGES.md | 1 + scheduler/job.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index bb30470491..23dbb6e1b3 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,7 @@ Changes in CUPS v2.4.7 (TBA) - Added OpenSSL support for cupsHashData (Issue #762) - Fixed delays in lpd backend (Issue #741) +- Fixed extensive logging in scheduler (Issue #604) - Fixed printing to stderr if we can't open cups-files.conf (Issue #777) - Fixed purging job files via `cancel -x` (Issue #742) - Fixed a bug in the PPD command interpretation code (Issue #768) diff --git a/scheduler/job.c b/scheduler/job.c index 5ac782e759..49e4fa3379 100644 --- a/scheduler/job.c +++ b/scheduler/job.c @@ -443,12 +443,12 @@ cupsdCleanJobs(void) job; job = (cupsd_job_t *)cupsArrayNext(Jobs)) { - cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdCleanJobs: Job %d, state=%d, printer=%p, history_time=%d, file_time=%d", job->id, (int)job->state_value, (void *)job->printer, (int)job->history_time, (int)job->file_time); + cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdCleanJobs: Job %d, state=%d, printer=%p, history_time=%d, file_time=%d, num_files=%d", job->id, (int)job->state_value, (void *)job->printer, (int)job->history_time, (int)job->file_time, (int)job->num_files); if ((job->history_time && job->history_time < JobHistoryUpdate) || !JobHistoryUpdate) JobHistoryUpdate = job->history_time; - if ((job->file_time && job->file_time < JobHistoryUpdate) || !JobHistoryUpdate) + if (job->num_files > 0 && ((job->file_time && job->file_time < JobHistoryUpdate) || !JobHistoryUpdate)) JobHistoryUpdate = job->file_time; if (job->state_value >= IPP_JOB_CANCELED && !job->printer)