diff options
author | Martin Pitt <martin.pitt@ubuntu.com> | 2016-08-09 18:11:47 +0200 |
---|---|---|
committer | Didier Raboud <odyx@debian.org> | 2019-05-08 14:52:46 +0200 |
commit | 79c98928ef373d5db7097b25d1bd7745f3dd1b5a (patch) | |
tree | f41816d2670b06a8f6c05bd2acdbe5074a3bbbbd | |
parent | ea4f9320dfa51cb939e3a8c24ee0a182e2720817 (diff) |
Set default job error policy to "retry-job", since it is less
confusing and a better default on most machines.
.
Amend documentation accordingly.
Author: Didier Raboud <odyx@debian.org>
Origin: vendor
Last-Update: 2016-07-03
Patch-Name: cups-set-default-error-policy-retry-job.patch
-rw-r--r-- | doc/help/man-cupsd.conf.html | 4 | ||||
-rw-r--r-- | man/cupsd.conf.5 | 4 | ||||
-rw-r--r-- | scheduler/conf.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html index f889b866f..862d92e20 100644 --- a/doc/help/man-cupsd.conf.html +++ b/doc/help/man-cupsd.conf.html @@ -95,9 +95,9 @@ The default is typically the server's ".local" hostname. <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. <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> -<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> <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. diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5 index 5788265fa..79f17ea0c 100644 --- a/man/cupsd.conf.5 +++ b/man/cupsd.conf.5 @@ -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. .TP 5 \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 \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 .TP 5 \fBFilterLimit \fIlimit\fR diff --git a/scheduler/conf.c b/scheduler/conf.c index d90f41d7b..f4f6a410f 100644 --- a/scheduler/conf.c +++ b/scheduler/conf.c @@ -752,7 +752,7 @@ cupsdReadConfiguration(void) cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE); cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE); - cupsdSetString(&ErrorPolicy, "stop-printer"); + cupsdSetString(&ErrorPolicy, "retry-job"); JobHistory = DEFAULT_HISTORY; JobFiles = DEFAULT_FILES; @@ -1233,8 +1233,8 @@ cupsdReadConfiguration(void) strcmp(ErrorPolicy, "retry-job") && strcmp(ErrorPolicy, "stop-printer")) { - cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"stop-printer\".", ErrorPolicy); - cupsdSetString(&ErrorPolicy, "stop-printer"); + cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"retry-job\".", ErrorPolicy); + cupsdSetString(&ErrorPolicy, "retry-job"); } /* |