From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Thu, 7 Nov 2013 14:33:00 +0000 (+0000)
Subject: <rdar://problem/15313228> "Canceling stuck job after XXX seconds" message should... 
X-Git-Tag: v2.2b1~812
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3dfbe13b31dd3ea10f7f39926bab9953fb7d1fa;p=thirdparty%2Fcups.git

<rdar://problem/15313228> "Canceling stuck job after XXX seconds" message should use "job-cancel-after" value


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11408 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/scheduler/job.c b/scheduler/job.c
index 626d8bdbb7..e82ca025cd 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -270,12 +270,14 @@ cupsdCheckJobs(void)
 
     if (job->cancel_time && job->cancel_time <= curtime)
     {
+      ipp_attribute_t *attr = ippFindAttribute(job->attrs, "job-cancel-after", IPP_TAG_INTEGER);
+      int cancel_after = attr ? ippGetInteger(attr, 0) : MaxJobTime;
+					/* job-cancel-after value */
+
       if (job->completed)
-	cupsdSetJobState(job, IPP_JOB_CANCELED, CUPSD_JOB_FORCE,
-			 "Marking stuck job as completed after %d seconds.", MaxJobTime);
+	cupsdSetJobState(job, IPP_JOB_CANCELED, CUPSD_JOB_FORCE, "Marking stuck job as completed after %d seconds.", cancel_after);
       else
-	cupsdSetJobState(job, IPP_JOB_CANCELED, CUPSD_JOB_DEFAULT,
-			 "Canceling stuck job after %d seconds.", MaxJobTime);
+	cupsdSetJobState(job, IPP_JOB_CANCELED, CUPSD_JOB_DEFAULT, "Canceling stuck job after %d seconds.", cancel_after);
       continue;
     }