diff --git a/VERSION b/VERSION index 47e2585f..f39bd427 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.00.0 (2012-08-20 10:57:08) dev +Version 2.00.0 (2012-08-20 10:58:09) dev diff --git a/gluon/scheduler.py b/gluon/scheduler.py index 1f5cd6ce..1875fe7e 100644 --- a/gluon/scheduler.py +++ b/gluon/scheduler.py @@ -109,7 +109,7 @@ HEARTBEAT = 3*SECONDS MAXHIBERNATION = 10 CLEAROUT = '!clear!' -CALLABLETYPES = (types.LambdaType, types.FunctionType, +CALLABLETYPES = (types.LambdaType, types.FunctionType, types.BuiltinFunctionType, types.MethodType, types.BuiltinMethodType) @@ -187,7 +187,7 @@ def executor(queue,task, out): pass def write(self,data): self.out_queue.put(data) - + stdout = LogOutput(out) try: if task.app: @@ -265,7 +265,7 @@ class MetaScheduler(threading.Thread): while p.is_alive() and (time.time()-start < task.timeout): if tout: try: - logging.debug("aaaaaaaaaaaaaa partial output saved") + logging.debug(' partial output saved') db(sr.id==task.run_id).update(output = task_output) db.commit() except: