|
 |
a9d1fb |
diff --git a/scheduler/log.c b/scheduler/log.c
|
|
|
a9d1fb |
index 33cdac6..d66bbf9 100644
|
|
|
a9d1fb |
--- a/scheduler/log.c
|
|
|
a9d1fb |
+++ b/scheduler/log.c
|
|
|
a9d1fb |
@@ -597,51 +597,6 @@ cupsdLogJob(cupsd_job_t *job, /* I - Job */
|
|
|
a9d1fb |
if (level > LogLevel && LogDebugHistory <= 0)
|
|
|
a9d1fb |
return (1);
|
|
|
a9d1fb |
|
|
|
a9d1fb |
-#ifdef HAVE_SYSTEMD_SD_JOURNAL_H
|
|
|
a9d1fb |
- if (!strcmp(ErrorLog, "syslog"))
|
|
|
a9d1fb |
- {
|
|
|
a9d1fb |
- cupsd_printer_t *printer = job ? (job->printer ? job->printer : (job->dest ? cupsdFindDest(job->dest) : NULL)) : NULL;
|
|
|
a9d1fb |
- static const char * const job_states[] =
|
|
|
a9d1fb |
- { /* job-state strings */
|
|
|
a9d1fb |
- "Pending",
|
|
|
a9d1fb |
- "PendingHeld",
|
|
|
a9d1fb |
- "Processing",
|
|
|
a9d1fb |
- "ProcessingStopped",
|
|
|
a9d1fb |
- "Canceled",
|
|
|
a9d1fb |
- "Aborted",
|
|
|
a9d1fb |
- "Completed"
|
|
|
a9d1fb |
- };
|
|
|
a9d1fb |
-
|
|
|
a9d1fb |
- va_start(ap, message);
|
|
|
a9d1fb |
-
|
|
|
a9d1fb |
- do
|
|
|
a9d1fb |
- {
|
|
|
a9d1fb |
- va_copy(ap2, ap);
|
|
|
a9d1fb |
- status = format_log_line(message, ap2);
|
|
|
a9d1fb |
- va_end(ap2);
|
|
|
a9d1fb |
- }
|
|
|
a9d1fb |
- while (status == 0);
|
|
|
a9d1fb |
-
|
|
|
a9d1fb |
- va_end(ap);
|
|
|
a9d1fb |
-
|
|
|
a9d1fb |
- if (job)
|
|
|
a9d1fb |
- sd_journal_send("MESSAGE=%s", log_line,
|
|
|
a9d1fb |
- "PRIORITY=%i", log_levels[level],
|
|
|
a9d1fb |
- PWG_Event"=JobStateChanged",
|
|
|
a9d1fb |
- PWG_ServiceURI"=%s", printer ? printer->uri : "",
|
|
|
a9d1fb |
- PWG_JobID"=%d", job->id,
|
|
|
a9d1fb |
- PWG_JobState"=%s", job->state_value < IPP_JSTATE_PENDING ? "" : job_states[job->state_value - IPP_JSTATE_PENDING],
|
|
|
a9d1fb |
- PWG_JobImpressionsCompleted"=%d", ippGetInteger(job->impressions, 0),
|
|
|
a9d1fb |
- NULL);
|
|
|
a9d1fb |
- else
|
|
|
a9d1fb |
- sd_journal_send("MESSAGE=%s", log_line,
|
|
|
a9d1fb |
- "PRIORITY=%i", log_levels[level],
|
|
|
a9d1fb |
- NULL);
|
|
|
a9d1fb |
-
|
|
|
a9d1fb |
- return (1);
|
|
|
a9d1fb |
- }
|
|
|
a9d1fb |
-#endif /* HAVE_SYSTEMD_SD_JOURNAL_H */
|
|
|
a9d1fb |
-
|
|
|
a9d1fb |
/*
|
|
|
a9d1fb |
* Format and write the log message...
|
|
|
a9d1fb |
*/
|
|
|
a9d1fb |
@@ -705,7 +660,43 @@ cupsdLogJob(cupsd_job_t *job, /* I - Job */
|
|
|
a9d1fb |
return (1);
|
|
|
a9d1fb |
}
|
|
|
a9d1fb |
else if (level <= LogLevel)
|
|
|
a9d1fb |
+ {
|
|
|
a9d1fb |
+#ifdef HAVE_SYSTEMD_SD_JOURNAL_H
|
|
|
a9d1fb |
+ if (!strcmp(ErrorLog, "syslog"))
|
|
|
a9d1fb |
+ {
|
|
|
a9d1fb |
+ cupsd_printer_t *printer = job ? (job->printer ? job->printer : (job->dest ? cupsdFindDest(job->dest) : NULL)) : NULL;
|
|
|
a9d1fb |
+ static const char * const job_states[] =
|
|
|
a9d1fb |
+ { /* job-state strings */
|
|
|
a9d1fb |
+ "Pending",
|
|
|
a9d1fb |
+ "PendingHeld",
|
|
|
a9d1fb |
+ "Processing",
|
|
|
a9d1fb |
+ "ProcessingStopped",
|
|
|
a9d1fb |
+ "Canceled",
|
|
|
a9d1fb |
+ "Aborted",
|
|
|
a9d1fb |
+ "Completed"
|
|
|
a9d1fb |
+ };
|
|
|
a9d1fb |
+
|
|
|
a9d1fb |
+ if (job)
|
|
|
a9d1fb |
+ sd_journal_send("MESSAGE=%s", log_line,
|
|
|
a9d1fb |
+ "PRIORITY=%i", log_levels[level],
|
|
|
a9d1fb |
+ PWG_Event"=JobStateChanged",
|
|
|
a9d1fb |
+ PWG_ServiceURI"=%s", printer ? printer->uri : "",
|
|
|
a9d1fb |
+ PWG_JobID"=%d", job->id,
|
|
|
a9d1fb |
+ PWG_JobState"=%s", job->state_value < IPP_JSTATE_PENDING ? "" : job_states[job->state_value - IPP_JSTATE_PENDING],
|
|
|
a9d1fb |
+ PWG_JobImpressionsCompleted"=%d", ippGetInteger(job->impressions, 0),
|
|
|
a9d1fb |
+ NULL);
|
|
|
a9d1fb |
+ else
|
|
|
a9d1fb |
+ sd_journal_send("MESSAGE=%s", log_line,
|
|
|
a9d1fb |
+ "PRIORITY=%i", log_levels[level],
|
|
|
a9d1fb |
+ NULL);
|
|
|
a9d1fb |
+
|
|
|
a9d1fb |
+ return (1);
|
|
|
a9d1fb |
+ }
|
|
|
a9d1fb |
+ else
|
|
|
a9d1fb |
+#endif /* HAVE_SYSTEMD_SD_JOURNAL_H */
|
|
|
a9d1fb |
+
|
|
|
a9d1fb |
return (cupsdWriteErrorLog(level, log_line));
|
|
|
a9d1fb |
+ }
|
|
|
a9d1fb |
else
|
|
|
a9d1fb |
return (1);
|
|
|
a9d1fb |
}
|