From a620024de6d3109af9ebcf49bac18e8543af3981 Mon Sep 17 00:00:00 2001 From: Damien De Paoli Date: Wed, 3 Aug 2022 17:59:41 +1000 Subject: [PATCH] remove debug, fix BUG-105 by setting last_update on job always --- pa_job_manager.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pa_job_manager.py b/pa_job_manager.py index 3f89cdd..e603930 100644 --- a/pa_job_manager.py +++ b/pa_job_manager.py @@ -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()