From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Wed, 1 May 2019 18:58:28 +0000 (-0400)
Subject: Update the hold expiration logging - one case is an error, the other is normal (Issue... 
X-Git-Tag: v2.2.12~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2eba043171fd8fab45d30a831b4ee031a751d63;p=thirdparty%2Fcups.git

Update the hold expiration logging - one case is an error, the other is normal (Issue #5570)
---

diff --git a/scheduler/job.c b/scheduler/job.c
index 17001936f9..cd49a0fbc0 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -307,10 +307,12 @@ cupsdCheckJobs(void)
 
         if (cupsdTimeoutJob(job))
 	  continue;
-      }
 
-      cupsdSetJobState(job, IPP_JOB_PENDING, CUPSD_JOB_DEFAULT, "Job submission timed out.");
-      cupsdLogJob(job, CUPSD_LOG_ERROR, "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.");
+      }
+      else
+	cupsdSetJobState(job, IPP_JOB_PENDING, CUPSD_JOB_DEFAULT, "Job hold expired.");
     }
 
    /*