cups-1.7.0: use cupsdLogJob() where appropriate
PATCH 1/1 cups-1.7.0: use cupsdLogJob() where appropriate
Hi,
This patch removes some code duplication by using cupsdLogJob() wherever we were adding the "[Job %d] " prefix.
Tim.
*/
scheduler/job.c renamed from scheduler/job.c.journal +37 -49
@@ -312,8 +312,7 @@ cupsdCheckJobs(void)if (job->kill_time && job->kill_time <= curtime) { -cupsdLogMessage (CUPSD_LOG_ERROR ,"[Job %d] Stopping unresponsive job." , - job->id); +cupsdLogJob (job,CUPSD_LOG_ERROR ,"Stopping unresponsive job." );stop_job (job,CUPSD_JOB_FORCE );continue ;
@@ -1699,7 +1698,7 @@ cupsdLoadJob(cupsd_job_t *job) /* I - J* Load job attributes... */ -cupsdLogMessage (CUPSD_LOG_DEBUG ,"[Job %d] Loading attributes..." , job->id); +cupsdLogJob (job,CUPSD_LOG_DEBUG ,"Loading attributes..." );snprintf (jobfile,sizeof (jobfile),"%s/c%05d" , RequestRoot, job->id);if ((fp =cupsdOpenConfFile (jobfile)) ==NULL )
@@ -1707,9 +1706,8 @@ cupsdLoadJob(cupsd_job_t *job) /* I - Jif (ippReadIO (fp, (ipp_iocb_t )cupsFileRead,1 ,NULL , job->attrs) !=IPP_DATA ) { -cupsdLogMessage (CUPSD_LOG_ERROR , -"[Job %d] Unable to read job control file \"%s\"." , job->id, - jobfile); +cupsdLogJob (job,CUPSD_LOG_ERROR , +"Unable to read job control file \"%s\"." , jobfile);cupsFileClose (fp); goto error; }
@@ -1722,18 +1720,16 @@ cupsdLoadJob(cupsd_job_t *job) /* I - Jif (!ippFindAttribute (job->attrs,"time-at-creation" ,IPP_TAG_INTEGER )) { -cupsdLogMessage (CUPSD_LOG_ERROR , -"[Job %d] Missing or bad time-at-creation attribute in " -"control file." , job->id); +cupsdLogJob (job,CUPSD_LOG_ERROR , +"Missing or bad time-at-creation attribute in control file." ); goto error; }if ((job->state =ippFindAttribute (job->attrs,"job-state" ,IPP_TAG_ENUM )) ==NULL ) { -cupsdLogMessage (CUPSD_LOG_ERROR , -"[Job %d] Missing or bad job-state attribute in control " -"file." , job->id); +cupsdLogJob (job,CUPSD_LOG_ERROR , +"Missing or bad job-state attribute in control file." ); goto error; }
@@ -1773,18 +1769,17 @@ cupsdLoadJob(cupsd_job_t *job) /* I - Jif ((attr =ippFindAttribute (job->attrs,"job-printer-uri" ,IPP_TAG_URI )) ==NULL ) { -cupsdLogMessage (CUPSD_LOG_ERROR , -"[Job %d] No job-printer-uri attribute in control file." , - job->id); +cupsdLogJob (job,CUPSD_LOG_ERROR , +"No job-printer-uri attribute in control file." ); goto error; }if ((dest =cupsdValidateDest (attr->values[0 ].string.text, &(job->dtype), &destptr)) ==NULL ) { -cupsdLogMessage (CUPSD_LOG_ERROR , -"[Job %d] Unable to queue job for destination \"%s\"." , - job->id, attr->values[0 ].string.text); +cupsdLogJob (job,CUPSD_LOG_ERROR , +"Unable to queue job for destination \"%s\"." , + attr->values[0 ].string.text); goto error; }
@@ -1792,9 +1787,9 @@ cupsdLoadJob(cupsd_job_t *job) /* I - J }else if ((destptr =cupsdFindDest (job->dest)) ==NULL ) { -cupsdLogMessage (CUPSD_LOG_ERROR , -"[Job %d] Unable to queue job for destination \"%s\"." , - job->id, job->dest); +cupsdLogJob (job,CUPSD_LOG_ERROR , +"Unable to queue job for destination \"%s\"." , + job->dest); goto error; }
@@ -1803,9 +1798,8 @@ cupsdLoadJob(cupsd_job_t *job) /* I - J {const char *reason;/* job-state-reason keyword */ -cupsdLogMessage (CUPSD_LOG_DEBUG , -"[Job %d] Adding missing job-state-reasons attribute to " -" control file." , job->id); +cupsdLogJob (job,CUPSD_LOG_DEBUG , +"Adding missing job-state-reasons attribute to control file." );switch (job->state_value) {
@@ -1870,9 +1864,8 @@ cupsdLoadJob(cupsd_job_t *job) /* I - Jif ((attr =ippFindAttribute (job->attrs,"job-priority" ,IPP_TAG_INTEGER )) ==NULL ) { -cupsdLogMessage (CUPSD_LOG_ERROR , -"[Job %d] Missing or bad job-priority attribute in " -"control file." , job->id); +cupsdLogJob (job,CUPSD_LOG_ERROR , +"Missing or bad job-priority attribute in control file." ); goto error; }
@@ -1884,9 +1877,9 @@ cupsdLoadJob(cupsd_job_t *job) /* I - Jif ((attr =ippFindAttribute (job->attrs,"job-originating-user-name" ,IPP_TAG_NAME )) ==NULL ) { -cupsdLogMessage (CUPSD_LOG_ERROR , -"[Job %d] Missing or bad job-originating-user-name " -"attribute in control file." , job->id); +cupsdLogJob (job,CUPSD_LOG_ERROR , +"Missing or bad job-originating-user-name " +"attribute in control file." ); goto error; }
@@ -1931,9 +1924,8 @@ cupsdLoadJob(cupsd_job_t *job) /* I - Jif (access (jobfile,0 ))break ; -cupsdLogMessage (CUPSD_LOG_DEBUG , -"[Job %d] Auto-typing document file \"%s\"..." , job->id, - jobfile); +cupsdLogJob (job,CUPSD_LOG_DEBUG , +"Auto-typing document file \"%s\"..." , jobfile);if (fileid > job->num_files) {
@@ -1959,9 +1951,8 @@ cupsdLoadJob(cupsd_job_t *job) /* I - Jif (!compressions || !filetypes) { -cupsdLogMessage (CUPSD_LOG_ERROR , -"[Job %d] Ran out of memory for job file types." , - job->id); +cupsdLogJob (job,CUPSD_LOG_ERROR , +"Ran out of memory for job file types." );ippDelete (job->attrs); job->attrs =NULL ;
@@ -2269,8 +2260,7 @@ cupsdSaveJob(cupsd_job_t *job) /* I - Jif (ippWriteIO (fp, (ipp_iocb_t )cupsFileWrite,1 ,NULL , job->attrs) !=IPP_DATA ) { -cupsdLogMessage (CUPSD_LOG_ERROR , -"[Job %d] Unable to write job control file." , job->id); +cupsdLogJob (job,CUPSD_LOG_ERROR ,"Unable to write job control file." );cupsFileClose (fp);return ; }
@@ -4135,8 +4125,7 @@ load_job_cache(const char *filename) /* job->status_pipes[0 ] =-1 ; job->status_pipes[1 ] =-1 ; -cupsdLogMessage (CUPSD_LOG_DEBUG ,"[Job %d] Loading from cache..." , - job->id); +cupsdLogJob (job,CUPSD_LOG_DEBUG ,"Loading from cache..." ); }else if (!job) {
@@ -4205,8 +4194,7 @@ load_job_cache(const char *filename) /* job->id);if (access (jobfile,0 )) { -cupsdLogMessage (CUPSD_LOG_INFO ,"[Job %d] Data files have gone away." , - job->id); +cupsdLogJob (job,CUPSD_LOG_INFO ,"Data files have gone away." ); job->num_files =0 ;continue ; }
@@ -4216,9 +4204,9 @@ load_job_cache(const char *filename) /*if (!job->filetypes || !job->compressions) { -cupsdLogMessage (CUPSD_LOG_EMERG , -"[Job %d] Unable to allocate memory for %d files." , - job->id, job->num_files); +cupsdLogJob (job,CUPSD_LOG_EMERG , +"Unable to allocate memory for %d files." , + job->num_files);break ; } }
@@ -4256,9 +4244,9 @@ load_job_cache(const char *filename) /** If the original MIME type is unknown, auto-type it! */ -cupsdLogMessage (CUPSD_LOG_ERROR , -"[Job %d] Unknown MIME type %s/%s for file %d." , - job->id, super, type, number +1 ); +cupsdLogJob (job,CUPSD_LOG_ERROR , +"Unknown MIME type %s/%s for file %d." , + super, type, number +1 );snprintf (jobfile,sizeof (jobfile),"%s/d%05d-%03d" , RequestRoot, job->id, number +1 );
@@ -4770,7 +4758,7 @@ unload_job(cupsd_job_t *job) /* I - Jobif (!job->attrs)return ; -cupsdLogMessage (CUPSD_LOG_DEBUG ,"[Job %d] Unloading..." , job->id); +cupsdLogJob (job,CUPSD_LOG_DEBUG ,"Unloading..." );ippDelete (job->attrs);