Add [Job N] string into journal
This commit is contained in:
parent
0d9410846c
commit
9b153242e7
16
cups-logs.patch
Normal file
16
cups-logs.patch
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
diff --git a/scheduler/log.c b/scheduler/log.c
|
||||||
|
index 17331ff02..41ddb4cb9 100644
|
||||||
|
--- a/scheduler/log.c
|
||||||
|
+++ b/scheduler/log.c
|
||||||
|
@@ -569,11 +569,7 @@ cupsdLogJob(cupsd_job_t *job, /* I - Job */
|
||||||
|
* Format and write the log message...
|
||||||
|
*/
|
||||||
|
|
||||||
|
-#ifdef HAVE_SYSTEMD_SD_JOURNAL_H
|
||||||
|
- if (job && strcmp(ErrorLog, "syslog"))
|
||||||
|
-#else
|
||||||
|
if (job)
|
||||||
|
-#endif /* HAVE_SYSTEMD_SD_JOURNAL_H */
|
||||||
|
snprintf(jobmsg, sizeof(jobmsg), "[Job %d] %s", job->id, message);
|
||||||
|
else
|
||||||
|
strlcpy(jobmsg, message, sizeof(jobmsg));
|
@ -17,7 +17,7 @@ Summary: CUPS printing system
|
|||||||
Name: cups
|
Name: cups
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 2.3.3%{OP_VER}
|
Version: 2.3.3%{OP_VER}
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
Url: http://www.cups.org/
|
Url: http://www.cups.org/
|
||||||
# Apple stopped uploading the new versions into github, use OpenPrinting fork
|
# Apple stopped uploading the new versions into github, use OpenPrinting fork
|
||||||
@ -61,6 +61,8 @@ Patch11: cups-web-devices-timeout.patch
|
|||||||
Patch12: cups-failover-backend.patch
|
Patch12: cups-failover-backend.patch
|
||||||
# add device id for dymo printer
|
# add device id for dymo printer
|
||||||
Patch13: cups-dymo-deviceid.patch
|
Patch13: cups-dymo-deviceid.patch
|
||||||
|
# add [Job N] in logs
|
||||||
|
Patch16: cups-logs.patch
|
||||||
|
|
||||||
%if %{lspp}
|
%if %{lspp}
|
||||||
# selinux and audit enablement for CUPS - needs work and CUPS upstream wants
|
# selinux and audit enablement for CUPS - needs work and CUPS upstream wants
|
||||||
@ -267,6 +269,8 @@ to CUPS daemon. This solution will substitute printer drivers and raw queues in
|
|||||||
%patch12 -p1 -b .failover
|
%patch12 -p1 -b .failover
|
||||||
# Added IEEE 1284 Device ID for a Dymo device (bug #747866).
|
# Added IEEE 1284 Device ID for a Dymo device (bug #747866).
|
||||||
%patch13 -p1 -b .dymo-deviceid
|
%patch13 -p1 -b .dymo-deviceid
|
||||||
|
# add [Job N] to logs
|
||||||
|
%patch14 -p1 -b .logs
|
||||||
|
|
||||||
# UPSTREAM PATCHES
|
# UPSTREAM PATCHES
|
||||||
|
|
||||||
@ -666,6 +670,9 @@ rm -f %{cups_serverbin}/backend/smb
|
|||||||
%{_mandir}/man7/ippeveps.7.gz
|
%{_mandir}/man7/ippeveps.7.gz
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Mar 22 2021 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.3.3op2-3
|
||||||
|
- add [Job N] in logs for better debugging
|
||||||
|
|
||||||
* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1:2.3.3op2-2
|
* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1:2.3.3op2-2
|
||||||
- Rebuilt for updated systemd-rpm-macros
|
- Rebuilt for updated systemd-rpm-macros
|
||||||
See https://pagure.io/fesco/issue/2583.
|
See https://pagure.io/fesco/issue/2583.
|
||||||
|
Loading…
Reference in New Issue
Block a user