Task #8598: EoR job id is not per se an int, so treat id as string

LTA/LTAIngest/job_group.py.in

@@ -37,13 +37,15 @@ class job_group():
     self.parser    = parser.parser(logger)
     self.mailCommand = mailCommand
     self.get_db_info()
-    self.logger.info('New job_group %i initialzed' % self.Id)
+    self.logger.info('New job_group %s initialzed' % self.Id)
 
   def read_old_jobs(self, faileddir, donedir):
     done_files   = []
     failed_files = []
     if self.Type == 'MoM':
       Dir = '/A_%s/' % self.Id  
+    elif self.Type.lower() == 'eor':
+      Dir = 'EoR_%s/' % self.Id
     else: ## tier0-ingest
       Dir = '/B_%s/' % self.Id
     if os.path.isdir(donedir + Dir):
@@ -64,7 +66,7 @@ class job_group():
           job['Status'] = JobError
           self.add_job(job)
           self.update_job(job, JobScheduled, JobError, None)
-    self.logger.info('New job_group %i has read %i old jobs' % (self.Id, len(done_files) + len(failed_files)))
+    self.logger.info('New job_group %s has read %i old jobs' % (self.Id, len(done_files) + len(failed_files)))
 
   def add_job(self, job):
     self.jobs[job['ExportID']] = job
@@ -131,9 +133,9 @@ class job_group():
   def check_finished(self):
     total = len(self.jobs)
     finished = (self.scheduled['Total'] == 0) and (self.active['Total'] == 0) and (self.inactive['Total'] == 0) and (self.retry['Total'] == 0)
-    self.logger.debug('job_group %i progress: #done=%i #failed=%i #scheduled=%i #active=%i #inactive=%i #retry=%i' % (self.Id, self.done['Total'], self.failed['Total'], self.scheduled['Total'], self.active['Total'], self.inactive['Total'], self.retry['Total']))
+    self.logger.debug('job_group %s progress: #done=%i #failed=%i #scheduled=%i #active=%i #inactive=%i #retry=%i' % (self.Id, self.done['Total'], self.failed['Total'], self.scheduled['Total'], self.active['Total'], self.inactive['Total'], self.retry['Total']))
     if finished and (total == self.failed['Total'] + self.done['Total']): ## sanity check, somewhat redundant
-      self.logger.info('job_group %i is finished, total of %i files' % (self.Id, total))
+      self.logger.info('job_group %s is finished, total of %i files' % (self.Id, total))
       return True
     return False
 
@@ -248,9 +250,9 @@ Total Failed: %(failed)i""" % {'done': self.done['Total'], 'corr': self.corr, 'b
       job_name = self.job_info['name']
       message = self.make_report()
     except Exception as e:
-      self.logger.error('Could not construct mail message for job_group %i' % (self.Id))
-    os.system('echo "%s"|mailx -s "Ingest job of %s, %s(%i) has ended" ' % (message, user, job_name, self.Id) + self.mailCommand)
-    self.logger.info('job_group %i sent an email to %s' % (self.Id, self.mailCommand))
+      self.logger.error('Could not construct mail message for job_group %s' % (self.Id))
+    os.system('echo "%s"|mailx -s "Ingest job of %s, %s(%s) has ended" ' % (message, user, job_name, self.Id) + self.mailCommand)
+    self.logger.info('job_group %s sent an email to %s' % (self.Id, self.mailCommand))
 
   
 ## Stand alone execution code ------------------------------------------