From 21d5b2485dd4b512a61ec74bea770d6033ef2f06 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 28 Feb 2012 11:33:06 +0530 Subject: [PATCH] fix in scheduler related import issues --- py/webnotes/utils/scheduler.py | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/py/webnotes/utils/scheduler.py b/py/webnotes/utils/scheduler.py index 50a18cec25..9a6e274de1 100644 --- a/py/webnotes/utils/scheduler.py +++ b/py/webnotes/utils/scheduler.py @@ -67,6 +67,9 @@ def execute(): if now.weekday()==0: out.append('weekly:' + trigger('execute_weekly')) + if now.hour != last.hour: + out.append('hourly:' + trigger('execute_hourly')) + out.append('all:' + trigger('execute_all')) webnotes.conn.set_global('scheduler_last_event', nowtime.strftime(format)) @@ -85,16 +88,18 @@ def trigger(method): return 'ok' except Exception, e: - webnotes.conn.rollback() - traceback = webnotes.getTraceback() - log(method, traceback) - return traceback - -def log(method, error): + return log(method) + +def log(method): """log error in patch_log""" + webnotes.conn.rollback() + traceback = webnotes.getTraceback() + import webnotes.utils webnotes.conn.sql("""insert into __SchedulerLog (`timestamp`, method, error) - values (%s, %s, %s)""", (webnotes.utils.now_datetime(), method, error)) - + values (%s, %s, %s)""", (webnotes.utils.now_datetime(), method, traceback)) + + return traceback + if __name__=='__main__': execute()