lib/isomorfeus/operation/run_task.rb in isomorfeus-operation-2.4.2 vs lib/isomorfeus/operation/run_task.rb in isomorfeus-operation-2.5.0

- old
+ new

@@ -50,19 +50,15 @@ @task_class.search(:state, 'ready').sort_by! { |task| task.rtime.to_i } end def mark_as_running(task) result = false - @task_class.object_expander.environment.transaction do - task = @task_class.load(key: task.key) - if task.rtime.nil? || (task.rtime - @rtime) >= @timer_task.execution_interval - if task.state == 'ready' - task.state = 'running' - task.rtime = @rtime - task.save - result = true - end - end + task = @task_class.load(key: task.key) + if task && (task.rtime.nil? || (task.rtime - @rtime) >= @timer_task.execution_interval) && task.state == 'ready' + task.state = 'running' + task.rtime = @rtime + task.save + result = true end result end def mark_as_ready(task)