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

faster scheduler, thanks Niphlod

Browse Source
This commit is contained in:
mdipierro
2012-10-17 16:01:29 -05:00
parent a2a011f007
commit 255cb5e1de
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.1.1 (2012-10-17 14:33:49) dev Version 2.1.1 (2012-10-17 16:01:25) dev
gluon/scheduler.py
+13 -8
View File
@@ -404,7 +404,7 @@ class TYPE(object):
class Scheduler(MetaScheduler): class Scheduler(MetaScheduler):
def __init__(self,db,tasks=None,migrate=True, def __init__(self,db,tasks=None,migrate=True,
worker_name=None,group_names=None,heartbeat=HEARTBEAT, worker_name=None,group_names=['main'],heartbeat=HEARTBEAT,
max_empty_runs=0, discard_results=False, utc_time=False): max_empty_runs=0, discard_results=False, utc_time=False):
MetaScheduler.__init__(self) MetaScheduler.__init__(self)
@@ -433,11 +433,17 @@ class Scheduler(MetaScheduler):
def now(self): def now(self):
return self.utc_time and datetime.datetime.utcnow() or datetime.datetime.now() return self.utc_time and datetime.datetime.utcnow() or datetime.datetime.now()
def define_tables(self,db,migrate): def set_requirements(self, scheduler_task):
from gluon import current from gluon import current
if hasattr(current,'request'):
scheduler_task.application_name.default= '%s/%s' % (
current.request.application, current.request.controller
)
def define_tables(self,db,migrate):
from gluon.dal import DEFAULT from gluon.dal import DEFAULT
logging.debug('defining tables (migrate=%s)' % migrate) logging.debug('defining tables (migrate=%s)' % migrate)
now = self.now() now = self.now
db.define_table( db.define_table(
'scheduler_task', 'scheduler_task',
Field('application_name',requires=IS_NOT_EMPTY(), Field('application_name',requires=IS_NOT_EMPTY(),
@@ -473,11 +479,9 @@ class Scheduler(MetaScheduler):
Field('times_failed','integer',default=0,writable=False), Field('times_failed','integer',default=0,writable=False),
Field('last_run_time','datetime',writable=False,readable=False), Field('last_run_time','datetime',writable=False,readable=False),
Field('assigned_worker_name',default='',writable=False), Field('assigned_worker_name',default='',writable=False),
on_define=self.set_requirements,
migrate=migrate,format='%(task_name)s') migrate=migrate,format='%(task_name)s')
if hasattr(current,'request'):
db.scheduler_task.application_name.default= '%s/%s' % (
current.request.application, current.request.controller
)
db.define_table( db.define_table(
'scheduler_run', 'scheduler_run',
@@ -500,7 +504,8 @@ class Scheduler(MetaScheduler):
Field('is_ticker', 'boolean', default=False, writable=False), Field('is_ticker', 'boolean', default=False, writable=False),
Field('group_names', 'list:string', default=self.group_names), Field('group_names', 'list:string', default=self.group_names),
migrate=migrate) migrate=migrate)
db.commit() if migrate:
db.commit()
def loop(self,worker_name=None): def loop(self,worker_name=None):
signal.signal(signal.SIGTERM, lambda signum, stack_frame: sys.exit(1)) signal.signal(signal.SIGTERM, lambda signum, stack_frame: sys.exit(1))