diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2019-05-01 14:39:03 -0400 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2019-05-01 14:39:03 -0400 |
| commit | d6395c6f1d67478e667eedc2e272e26e4400163f (patch) | |
| tree | 5bcfebced2a62ebb1b979be5c2995a3a4c423ff8 /scheduler | |
| parent | 87030afb3aa8735848c66a0526d06af69d7010c6 (diff) | |
| download | cups-d6395c6f1d67478e667eedc2e272e26e4400163f.tar.gz | |
Increase the MultipleOperationTimeOut default to 15 minutes, log an error if
the job submission times out (Issue #5570)
Diffstat (limited to 'scheduler')
| -rw-r--r-- | scheduler/conf.c | 2 | ||||
| -rw-r--r-- | scheduler/job.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scheduler/conf.c b/scheduler/conf.c index 1a2b1e1ce..85950a17d 100644 --- a/scheduler/conf.c +++ b/scheduler/conf.c @@ -729,7 +729,7 @@ cupsdReadConfiguration(void) MaxClientsPerHost = 0; MaxLogSize = 1024 * 1024; MaxRequestSize = 0; - MultipleOperationTimeout = DEFAULT_TIMEOUT; + MultipleOperationTimeout = 900; NumSystemGroups = 0; ReloadTimeout = DEFAULT_KEEPALIVE; RootCertDuration = 300; diff --git a/scheduler/job.c b/scheduler/job.c index 26cffdb61..f063c7d41 100644 --- a/scheduler/job.c +++ b/scheduler/job.c @@ -306,8 +306,8 @@ cupsdCheckJobs(void) continue; } - cupsdSetJobState(job, IPP_JOB_PENDING, CUPSD_JOB_DEFAULT, - "Job submission timed out."); + cupsdSetJobState(job, IPP_JOB_PENDING, CUPSD_JOB_DEFAULT, "Job submission timed out."); + cupsdLogJob(job, CUPSD_LOG_ERROR, "Job submission timed out."); } /* |