File cups-scheduler_logs_jobs_at_loglevel_info.patch of Package cups.17820
From 75c86da7a721554caea2dcc22a2f84b2fff465e8 Mon Sep 17 00:00:00 2001
From: Michael Sweet <michael.r.sweet@gmail.com>
Date: Mon, 16 May 2016 09:39:10 -0400
Subject: [PATCH] The scheduler now logs informational messages for jobs at
LogLevel "info" (Issue #4815)
---
Index: cups-1.7.5/scheduler/job.c
===================================================================
--- cups-1.7.5.orig/scheduler/job.c
+++ cups-1.7.5/scheduler/job.c
@@ -4931,7 +4931,7 @@ update_job(cupsd_job_t *job) /* I - Job
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))
Index: cups-1.7.5/scheduler/log.c
===================================================================
--- cups-1.7.5.orig/scheduler/log.c
+++ cups-1.7.5/scheduler/log.c
@@ -458,9 +458,7 @@ cupsdLogJob(cupsd_job_t *job, /* I - Jo
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);
/*
@@ -486,10 +484,7 @@ cupsdLogJob(cupsd_job_t *job, /* I - Jo
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...
@@ -528,8 +523,7 @@ cupsdLogJob(cupsd_job_t *job, /* I - Jo
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);