summaryrefslogtreecommitdiff
path: root/scheduler/log.c
diff options
context:
space:
mode:
authorMichael Sweet <michael.r.sweet@gmail.com>2017-07-19 15:29:01 -0400
committerMichael Sweet <michael.r.sweet@gmail.com>2017-07-19 15:29:01 -0400
commit9eb416ee89a4f808aeb5d5e11f55a3389dc3ca03 (patch)
treec576c8c46fab2bda0bbce46ee48dff39bf21975e /scheduler/log.c
parentb74b285e47fed3b0cc18d7f8d767b30bca4a2068 (diff)
downloadcups-9eb416ee89a4f808aeb5d5e11f55a3389dc3ca03.tar.gz
Fix logging when "-t" is used (always to stderr).
Diffstat (limited to 'scheduler/log.c')
-rw-r--r--scheduler/log.c18
1 files changed, 14 insertions, 4 deletions
diff --git a/scheduler/log.c b/scheduler/log.c
index 243742d17..95aa23ed6 100644
--- a/scheduler/log.c
+++ b/scheduler/log.c
@@ -703,7 +703,18 @@ cupsdLogMessage(int level, /* I - Log level */
* See if we want to log this message...
*/
- if ((TestConfigFile || !ErrorLog) && level <= CUPSD_LOG_WARN)
+ if (TestConfigFile && level <= CUPSD_LOG_WARN)
+ {
+ va_start(ap, message);
+
+ vfprintf(stderr, message, ap);
+ putc('\n', stderr);
+
+ va_end(ap);
+
+ return (1);
+ }
+ else if (!ErrorLog && level <= CUPSD_LOG_WARN)
{
va_start(ap, message);
@@ -722,12 +733,11 @@ cupsdLogMessage(int level, /* I - Log level */
return (1);
}
-
- if (level > LogLevel || !ErrorLog)
+ else if (level > LogLevel || !ErrorLog)
return (1);
#ifdef HAVE_SYSTEMD_SD_JOURNAL_H
- if (!strcmp(ErrorLog, "syslog"))
+ else if (!strcmp(ErrorLog, "syslog"))
{
va_start(ap, message);
sd_journal_printv(log_levels[level], message, ap);