Merge pull request #119 from niphlod/issue/1567

fixed issue 1567 with scheduler and Mysql
This commit is contained in:
mdipierro committed 2013-06-29 15:03:19 -07:00
commit d955af59af
1 file changed
+3 -2
+3 -2
View File
@@ -480,7 +480,8 @@ class Scheduler(MetaScheduler):
Field('function_name', Field('function_name',
requires=IS_IN_SET(sorted(self.tasks.keys())) requires=IS_IN_SET(sorted(self.tasks.keys()))
if self.tasks else DEFAULT), if self.tasks else DEFAULT),
Field('uuid', requires=IS_NOT_IN_DB(db, 'scheduler_task.uuid'), Field('uuid', length=255,
requires=IS_NOT_IN_DB(db, 'scheduler_task.uuid'),
unique=True, default=web2py_uuid), unique=True, default=web2py_uuid),
Field('args', 'text', default='[]', requires=TYPE(list)), Field('args', 'text', default='[]', requires=TYPE(list)),
Field('vars', 'text', default='{}', requires=TYPE(dict)), Field('vars', 'text', default='{}', requires=TYPE(dict)),
@@ -521,7 +522,7 @@ class Scheduler(MetaScheduler):
db.define_table( db.define_table(
'scheduler_worker', 'scheduler_worker',
Field('worker_name', unique=True), Field('worker_name', length=255, unique=True),
Field('first_heartbeat', 'datetime'), Field('first_heartbeat', 'datetime'),
Field('last_heartbeat', 'datetime'), Field('last_heartbeat', 'datetime'),
Field('status', requires=IS_IN_SET(WORKER_STATUS)), Field('status', requires=IS_IN_SET(WORKER_STATUS)),