diff options
| author | Michael Sweet <michael.r.sweet@gmail.com> | 2016-05-16 09:39:10 -0400 |
|---|---|---|
| committer | Michael Sweet <michael.r.sweet@gmail.com> | 2016-05-16 09:39:10 -0400 |
| commit | 75c86da7a721554caea2dcc22a2f84b2fff465e8 (patch) | |
| tree | 0e2ce6fd8366cb25b384ea3e641e161068da519f /scheduler/log.c | |
| parent | 6eb98aee93be531b09425ea4bce86cfe05e8b4ef (diff) | |
| download | cups-75c86da7a721554caea2dcc22a2f84b2fff465e8.tar.gz | |
The scheduler now logs informational messages for jobs at LogLevel "info"
(Issue #4815)
Diffstat (limited to 'scheduler/log.c')
| -rw-r--r-- | scheduler/log.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/scheduler/log.c b/scheduler/log.c index 44a1b6788..0a135a7a2 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); |