From 75c86da7a721554caea2dcc22a2f84b2fff465e8 Mon Sep 17 00:00:00 2001 From: Michael Sweet Date: Mon, 16 May 2016 09:39:10 -0400 Subject: [PATCH] The scheduler now logs informational messages for jobs at LogLevel "info" (Issue #4815) --- CHANGES.txt | 4 +++- scheduler/job.c | 2 +- scheduler/log.c | 14 ++++---------- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 25c7dabd17..b9e5717186 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,8 +1,10 @@ -CHANGES.txt - 2.2b1 - 2016-05-13 +CHANGES.txt - 2.2b1 - 2016-05-16 -------------------------------- CHANGES IN CUPS V2.2b1 + - The scheduler now logs informational messages for jobs at LogLevel + "info" (Issue #4815) - The scheduler now uses the getgrouplist function when available (Issue #4611) - The IPP backend no longer enables compression by default except for diff --git a/scheduler/job.c b/scheduler/job.c index a2d0e98630..11412face9 100644 --- a/scheduler/job.c +++ b/scheduler/job.c @@ -5183,7 +5183,7 @@ update_job(cupsd_job_t *job) /* I - Job to check */ ptr = message; if (*ptr) - cupsdLogJob(job, loglevel, "%s", ptr); + cupsdLogJob(job, loglevel == CUPSD_LOG_INFO ? CUPSD_LOG_DEBUG : loglevel, "%s", ptr); if (loglevel < CUPSD_LOG_DEBUG && strcmp(job->printer->state_message, ptr)) diff --git a/scheduler/log.c b/scheduler/log.c index 44a1b67886..0a135a7a28 100644 --- a/scheduler/log.c +++ b/scheduler/log.c @@ -1,7 +1,7 @@ /* * Log file routines for the CUPS scheduler. * - * Copyright 2007-2015 by Apple Inc. + * Copyright 2007-2016 by Apple Inc. * Copyright 1997-2007 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -582,9 +582,7 @@ cupsdLogJob(cupsd_job_t *job, /* I - Job */ if (TestConfigFile || !ErrorLog) return (1); - if ((level > LogLevel || - (level == CUPSD_LOG_INFO && LogLevel < CUPSD_LOG_DEBUG)) && - LogDebugHistory <= 0) + if (level > LogLevel && LogDebugHistory <= 0) return (1); #ifdef HAVE_ASL_H @@ -700,10 +698,7 @@ cupsdLogJob(cupsd_job_t *job, /* I - Job */ if (status > 0) { - if (job && - (level > LogLevel || - (level == CUPSD_LOG_INFO && LogLevel < CUPSD_LOG_DEBUG)) && - LogDebugHistory > 0) + if (job && level > LogLevel && LogDebugHistory > 0) { /* * Add message to the job history... @@ -742,8 +737,7 @@ cupsdLogJob(cupsd_job_t *job, /* I - Job */ return (1); } - else if (level <= LogLevel && - (level != CUPSD_LOG_INFO || LogLevel >= CUPSD_LOG_DEBUG)) + else if (level <= LogLevel) return (cupsdWriteErrorLog(level, log_line)); else return (1); -- 2.47.3