diff options
Diffstat (limited to 'bin/common/srtool_update.py')
| -rwxr-xr-x | bin/common/srtool_update.py | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/bin/common/srtool_update.py b/bin/common/srtool_update.py index 64501f69..c282f40b 100755 --- a/bin/common/srtool_update.py +++ b/bin/common/srtool_update.py @@ -94,9 +94,9 @@ def run_updates(force_all,name_filter,is_trial): cur_write = conn.cursor() time_now = datetime.now() #datetime.now(pytz.utc) - print("SRTool Update: time_now = %s" % time_now.strftime('%Y-%m-%d %H:%M:%S')) + print("SRTool Update: time_now = %s" % time_now.strftime(ORM.DATASOURCE_DATETIME_FORMAT)) status_str = "====================\n" - status_str += "Update: Date=%s,Filter='%s',Force=%s\n" % (time_now.strftime('%Y-%m-%d %H:%M:%S'),name_filter,force_all) + status_str += "Update: Date=%s,Filter='%s',Force=%s\n" % (time_now.strftime(ORM.DATASOURCE_DATETIME_FORMAT),name_filter,force_all) #get sources that have update command sources = cur.execute("SELECT * FROM orm_datasource").fetchall() @@ -125,11 +125,11 @@ def run_updates(force_all,name_filter,is_trial): # Get the datasource values update_frequency = source[ORM.DATASOURCE_UPDATE_FREQUENCY] - if not source[ORM.DATASOURCE_LASTMODIFIEDDATE]: - # Force update if no registed modified date for datasource (e.g. Init) - last_modified_date = time_now-timedelta(days=365) + if not source[ORM.DATASOURCE_LASTUPDATEDDATE]: + # Force update if no registed updated date for datasource (i.e. at Init phase) + last_updated_date = time_now - timedelta(days=365) else: - last_modified_date = datetime.strptime(source[ORM.DATASOURCE_LASTMODIFIEDDATE], '%Y-%m-%d %H:%M:%S') + last_updated_date = datetime.strptime(source[ORM.DATASOURCE_LASTUPDATEDDATE], ORM.DATASOURCE_DATETIME_FORMAT) # Get the update presets update_time = source[ORM.DATASOURCE_UPDATE_TIME] delta_minutes = get_tag_key(update_time,'minutes',None) @@ -156,7 +156,7 @@ def run_updates(force_all,name_filter,is_trial): continue elif ORM.DATASOURCE_ONSTARTUP == update_frequency: continue - testdate = last_modified_date + testdiff + testdate = last_updated_date + testdiff # Adjust for update presets if None != delta_minute: @@ -175,10 +175,10 @@ def run_updates(force_all,name_filter,is_trial): # Not yet? if testdate > time_now: - status_str += " Skip '%s': update time not reached (%s)\n" % (source[ORM.DATASOURCE_DESCRIPTION],testdate.strftime('%Y-%m-%d %H:%M:%S')) + status_str += " Skip '%s': update time not reached (%s)\n" % (source[ORM.DATASOURCE_DESCRIPTION],testdate.strftime(ORM.DATASOURCE_DATETIME_FORMAT)) continue else: - status_str += " UPDATE '%s': update time reached (%s)\n" % (source[ORM.DATASOURCE_DESCRIPTION],testdate.strftime('%Y-%m-%d %H:%M:%S')) + status_str += " UPDATE '%s': update time reached (%s)\n" % (source[ORM.DATASOURCE_DESCRIPTION],testdate.strftime(ORM.DATASOURCE_DATETIME_FORMAT)) # Execute the update if is_trial: @@ -187,15 +187,15 @@ def run_updates(force_all,name_filter,is_trial): else: print("Update required\t...\texecuting '%s'" % (source[ORM.DATASOURCE_UPDATE])) status_str += " > EXECUTE: execute '%s'\n" % (source[ORM.DATASOURCE_UPDATE]) - master_write("SRTOOL_UPDATE:%s:%s:%s\n" %(time_now.strftime('%Y-%m-%d %H:%M:%S'),source[ORM.DATASOURCE_DESCRIPTION],source[ORM.DATASOURCE_UPDATE])) + master_write("SRTOOL_UPDATE:%s:%s:%s\n" %(time_now.strftime(ORM.DATASOURCE_DATETIME_FORMAT),source[ORM.DATASOURCE_DESCRIPTION],source[ORM.DATASOURCE_UPDATE])) update_command = source[ORM.DATASOURCE_UPDATE] if force_all: update_command += " --force" os.system(os.path.join(script_pathname, update_command)) - # Reset datasource's last_modified_date - sql = "UPDATE orm_datasource SET lastModifiedDate=? WHERE id=?" - cur_write.execute(sql, (time_now.strftime('%Y-%m-%d %H:%M:%S'),source[ORM.DATASOURCE_ID],) ) + # Reset datasource's last_updated_date + sql = "UPDATE orm_datasource SET lastUpdatedDate=? WHERE id=?" + cur_write.execute(sql, (time_now.strftime(ORM.DATASOURCE_DATETIME_FORMAT),source[ORM.DATASOURCE_ID],) ) conn.commit() conn.close() @@ -239,6 +239,8 @@ def list(): continue frequency_str = ORM.get_orm_string(source[ORM.DATASOURCE_UPDATE_FREQUENCY],ORM.DATASOURCE_FREQUENCY_STR) print(format_str % (source[ORM.DATASOURCE_DATA],source[ORM.DATASOURCE_SOURCE],source[ORM.DATASOURCE_NAME],frequency_str,source[ORM.DATASOURCE_UPDATE_TIME],source[ORM.DATASOURCE_DESCRIPTION])) + if verbose: + print(format_str % ('',source[ORM.DATASOURCE_LASTMODIFIEDDATE],source[ORM.DATASOURCE_LASTUPDATEDDATE],'','','')) ################################# # Start 'cron' job for updates @@ -246,7 +248,7 @@ def list(): def cron_start(): pid = os.getpid() - master_write("SRTOOL_UPDATE:%s:Starting -v update cron job, pid=%s\n" % (datetime.now().strftime('%Y-%m-%d %H:%M:%S'),pid)) + master_write("SRTOOL_UPDATE:%s:Starting -v update cron job, pid=%s\n" % (datetime.now().strftime(ORM.DATASOURCE_DATETIME_FORMAT),pid)) # Preserve this app's pid srt_update_pid_file = os.path.join(script_pathname,SRT_UPDATE_PID_FILE) @@ -276,7 +278,7 @@ def cron_stop(): # Kill the update app os.system("kill %s" % pid) os.system("rm %s" % srt_update_pid_file) - master_write("SRTOOL_UPDATE:%s:Stopping -^ update cron job, pid=%s\n" % (datetime.now().strftime('%Y-%m-%d %H:%M:%S'),pid)) + master_write("SRTOOL_UPDATE:%s:Stopping -^ update cron job, pid=%s\n" % (datetime.now().strftime(ORM.DATASOURCE_DATETIME_FORMAT),pid)) else: print("No running update task file found") |