remove debug, fix BUG-105 by setting last_update on job always

This commit is contained in:
2022-08-03 17:59:41 +10:00
parent e1f0f54eee
commit a620024de6

View File

@@ -539,7 +539,8 @@ class PA_UserState(Base):
##############################################################################
def NewJob(name, num_files=0, wait_for=None, jex=None, parent_job=None ):
job=Job( name=name, current_file_num=0, current_file='', num_files=num_files,
wait_for=wait_for, state="New", pa_job_state="New", start_time=None, last_update=None)
wait_for=wait_for, state="New", pa_job_state="New", start_time=None,
last_update=datetime.now(pytz.utc) )
if jex != None:
for e in jex:
job.extra.append(e)
@@ -799,7 +800,7 @@ def JobMetadata(job):
def AddLogForJob(job, message):
now=datetime.now(pytz.utc)
log=Joblog( job_id=job.id, log=message, log_date=now )
job.last_update=now
job.last_update=datetime.now(pytz.utc)
session.add(log)
# some logs have DEBUG: in front, so clean that up
message = message.replace("DEBUG:", "" )
@@ -2380,7 +2381,6 @@ def AddFaceToFile( locn_data, face_data, file_eid, model_id, settings ):
# DelMatchesForDir(): quick func to delete any matched faces in the specified dir
####################################################################################################################################
def DelMatchesForDir( job, eid ):
print("Recurse through dirs deleting face per file" )
dir=session.query(Entry).get(eid)
ProcessFilesInDir( job, dir, DelMatchesForFile, False )
session.commit()