openkylin
/
cups
mirror of https://gitee.com/openkylin/cups.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Set default job error policy to "retry-job" 

It it is less confusing and a better default on most machines.
Amend documentation accordingly.

Author: Didier Raboud <odyx@debian.org>
Origin: vendor
Patch-Name: cups-set-default-error-policy-retry-job.patch

Gbp-Pq: Name 0030-Set-default-job-error-policy-to-retry-job.patch
This commit is contained in:
Martin Pitt 2016-08-09 18:11:47 +02:00 committed by openKylinBot
parent 6e3fd936c7
commit df78ba66a1
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/help/man-cupsd.conf.html
View File

@ -95,9 +95,9 @@ The default is typically the server's ".local" hostname.
<dt><b>ErrorPolicy retry-current-job</b> <dt><b>ErrorPolicy retry-current-job</b>
<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried immediately unless otherwise specified for the printer. <dd style="margin-left: 5.0em">Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
<dt><b>ErrorPolicy retry-job</b> <dt><b>ErrorPolicy retry-job</b>
<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. <dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
<dt><b>ErrorPolicy stop-printer</b> <dt><b>ErrorPolicy stop-printer</b>
<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default. <dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
<dt><a name="FilterLimit"></a><b>FilterLimit </b><i>limit</i> <dt><a name="FilterLimit"></a><b>FilterLimit </b><i>limit</i>
<dd style="margin-left: 5.0em">Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource problems. <dd style="margin-left: 5.0em">Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource problems.
A limit of 0 disables filter limiting. A limit of 0 disables filter limiting.

4
man/cupsd.conf.5
View File

@ -140,10 +140,10 @@ Specifies that a failed print job should be aborted (discarded) unless otherwise
Specifies that a failed print job should be retried immediately unless otherwise specified for the printer. Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
.TP 5 .TP 5
\fBErrorPolicy retry-job\fR \fBErrorPolicy retry-job\fR
Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
.TP 5 .TP 5
\fBErrorPolicy stop-printer\fR \fBErrorPolicy stop-printer\fR
Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default. Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
.\"#FilterLimit .\"#FilterLimit
.TP 5 .TP 5
\fBFilterLimit \fIlimit\fR \fBFilterLimit \fIlimit\fR

6
scheduler/conf.c
View File

@ -752,7 +752,7 @@ cupsdReadConfiguration(void)
cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE); cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE); cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE);
cupsdSetString(&ErrorPolicy, "stop-printer"); cupsdSetString(&ErrorPolicy, "retry-job");
JobHistory = DEFAULT_HISTORY; JobHistory = DEFAULT_HISTORY;
JobFiles = DEFAULT_FILES; JobFiles = DEFAULT_FILES;
@ -1233,8 +1233,8 @@ cupsdReadConfiguration(void)
strcmp(ErrorPolicy, "retry-job") && strcmp(ErrorPolicy, "retry-job") &&
strcmp(ErrorPolicy, "stop-printer")) strcmp(ErrorPolicy, "stop-printer"))
{ {
cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"stop-printer\".", ErrorPolicy); cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"retry-job\".", ErrorPolicy);
cupsdSetString(&ErrorPolicy, "stop-printer"); cupsdSetString(&ErrorPolicy, "retry-job");
} }
/* /*