odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] ir_cron: compare timestamps always as UTC (as of v6.1) 

bzr revid: odo@openerp.com-20110928224611-51eqnelo7mqomnwh
This commit is contained in:
Olivier Dony 2011-09-29 00:46:11 +02:00
parent f2b9b58fd3
commit a9a50c2cc8
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openerp/addons/base/ir/ir_cron.py
View File

@ -167,7 +167,8 @@ class ir_cron(osv.osv):
addsql = ''
if not numbercall:
addsql = ', active=False'
cr.execute("UPDATE ir_cron SET nextcall=%s, numbercall=%s"+addsql+" WHERE id=%s", (nextcall.strftime(DEFAULT_SERVER_DATETIME_FORMAT), numbercall, job['id']))
cr.execute("UPDATE ir_cron SET nextcall=%s, numbercall=%s"+addsql+" WHERE id=%s",
(nextcall.strftime(DEFAULT_SERVER_DATETIME_FORMAT), numbercall, job['id']))
if numbercall:
# Reschedule our own main cron thread if necessary.
@ -198,9 +199,10 @@ class ir_cron(osv.osv):
try:
jobs = {} # mapping job ids to jobs for all jobs being processed.
now = datetime.now()
# Careful to compare timestamps with 'UTC' - everything is UTC as of v6.1.
cr.execute("""SELECT * FROM ir_cron
WHERE numbercall != 0
AND active AND nextcall<=now()
AND active AND nextcall <= (now() at time zone 'UTC')
ORDER BY priority""")
for job in cr.dictfetchall():
if not openerp.cron.get_thread_slots():