dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed of scheduler column names, this breaks scheduler backard compatibility

Browse Source
This commit is contained in:
mdipierro
2012-12-19 11:24:55 -06:00
parent 4daada1142
commit 536ca3ec34
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.3.2 (2012-12-19 11:20:17) dev Version 2.3.2 (2012-12-19 11:23:59) dev
gluon/scheduler.py
+7 -7
View File
@@ -279,7 +279,7 @@ class MetaScheduler(threading.Thread):
if tout: if tout:
try: try:
logger.debug(' partial output saved') logger.debug(' partial output saved')
db(sr.id == task.run_id).update(output=task_output) db(sr.id == task.run_id).update(run_output=task_output)
db.commit() db.commit()
except: except:
pass pass
@@ -506,8 +506,8 @@ class Scheduler(MetaScheduler):
Field('status', requires=IS_IN_SET(RUN_STATUS)), Field('status', requires=IS_IN_SET(RUN_STATUS)),
Field('start_time', 'datetime'), Field('start_time', 'datetime'),
Field('stop_time', 'datetime'), Field('stop_time', 'datetime'),
Field('output', 'text'), Field('run_output', 'text'),
Field('result', 'text'), Field('run_result', 'text'),
Field('traceback', 'text'), Field('traceback', 'text'),
Field('worker_name', default=self.worker_name), Field('worker_name', default=self.worker_name),
migrate=migrate) migrate=migrate)
@@ -650,8 +650,8 @@ class Scheduler(MetaScheduler):
db(db.scheduler_run.id == task.run_id).update( db(db.scheduler_run.id == task.run_id).update(
status=task_report.status, status=task_report.status,
stop_time=now, stop_time=now,
result=task_report.result, run_result=task_report.result,
output=task_report.output, run_output=task_report.output,
traceback=task_report.tb) traceback=task_report.tb)
else: else:
logger.debug(' deleting task report in db because of no result') logger.debug(' deleting task report in db because of no result')
@@ -956,8 +956,8 @@ class Scheduler(MetaScheduler):
limitby=(0, 1)) limitby=(0, 1))
).first() ).first()
if output: if output:
row.result = row.scheduler_run.result and \ row.result = row.scheduler_run.run_result and \
loads(row.scheduler_run.result, loads(row.scheduler_run.run_result,
object_hook=_decode_dict) or None object_hook=_decode_dict) or None
return row return row