tasks_scheduler 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92bc6ed859a0f11435e932c9e9d2054c53c1067e
-  data.tar.gz: acdf9fe30cbeb5a1f3cb7c74e4ffca03ecff4734
+  metadata.gz: f1b92e7a9bc9fb0c7c43ef5a11422b51858a0466
+  data.tar.gz: af726dd48df8fec1ab31289023bbdad82b5dc3f7
 SHA512:
-  metadata.gz: d96061f6d2ddda365979479751fdc427783d337ae8040b67203e5112be67015aa5b850f289eaa0b5ace1743bfe4811fb594d0898c338737820628cd7dd426095
-  data.tar.gz: fd2e663c7f5a202972116057e345b6a67c3f66feb15422a2ffc0ddb39eb421646c9a4f2880b5aa0c94187663a49ac13fb1b7b408bed6293c78b2b125353527a2
+  metadata.gz: 3e46f79d1e2fdf7fef088126b0c2cefc2af3437a383e5ed1250c73a9a305f3d502e55684a2141712c752d33c5988bba969d83b0f9d1343e8cd5542172b84d552
+  data.tar.gz: 748695d547d7b1126263c00628233f5a1cb8beed84ef164d67b4e50fc99ee8638b68b0e39c48ee88a8923516c7e71dfe94cce677c0ca4073c6c0e416a3a80530

data/app/assets/stylesheets/tasks_scheduler.scss

@@ -30,6 +30,10 @@
     td.status_aborted {
       color: magenta;
     }
+
+    td.status_timeout {
+      color: orange;
+    }
   }
 
   .last_run {

data/app/models/scheduled_task.rb

@@ -6,6 +6,9 @@ class ScheduledTask < ActiveRecord::Base
   include ::ScheduledTask::Runner
   include ::ScheduledTask::Status
 
+  DEFAULT_TIMEOUT_ENVVAR_NAME = 'TASKS_SCHEDULER_TIMEOUT'.freeze
+  DEFAULT_TIMEOUT = 12.hours
+
   class << self
     def rake_tasks
       @rake_tasks ||= begin
@@ -13,14 +16,24 @@ class ScheduledTask < ActiveRecord::Base
         Rake.application.tasks.map(&:name)
       end
     end
+
+    def timeout
+      @timeout ||= begin
+        r = Integer(ENV[DEFAULT_TIMEOUT_ENVVAR_NAME])
+        r > 0 ? r.seconds : DEFAULT_TIMEOUT
+      rescue ArgumentError, TypeError
+        DEFAULT_TIMEOUT
+      end
+    end
   end
 
   STATUS_RUNNING = 'running'
   STATUS_FAILED = 'failed'
   STATUS_WAITING = 'waiting'
   STATUS_ABORTED = 'aborted'
+  STATUS_TIMEOUT = 'timeout'
 
-  LAST_FAIL_STATUSES = [STATUS_FAILED, STATUS_ABORTED]
+  LAST_FAIL_STATUSES = [STATUS_FAILED, STATUS_ABORTED, STATUS_TIMEOUT]
 
   validates :scheduling, presence: true, 'tasks_scheduler/cron_scheduling': true
   validates :task, presence: true, inclusion: { in: rake_tasks }

data/app/models/scheduled_task/checker.rb

@@ -15,7 +15,12 @@ class ScheduledTask < ActiveRecord::Base
 
     def check_on_pid_present
       if process_running?
-        check_log('Already running')
+        if timeout?
+          check_log('Timeout')
+          on_end_running(StandardError.new("Timeout (PID: #{pid}. running time: #{running_time})"), STATUS_TIMEOUT)
+        else
+          check_log('Already running')
+        end
       else
         check_log('Aborted')
         on_end_running(Exception.new("Aborted (PID: #{pid} not found)"), STATUS_ABORTED)
@@ -44,7 +49,7 @@ class ScheduledTask < ActiveRecord::Base
     def check_task_without_next_run
       check_log('Next run blank')
       update_attributes!(next_run: calculate_next_run)
-      check_log("Next run @scheduled_taskored: #{next_run.in_time_zone}")
+      check_log("Next run scheduled: #{next_run.in_time_zone}")
     end
 
     def check_task_with_next_run
@@ -66,5 +71,13 @@ class ScheduledTask < ActiveRecord::Base
       Process.detach(spawn_pid)
       update_attributes!(pid: spawn_pid, last_fail_status: nil)
     end
+
+    def timeout?
+      running_time >= ::ScheduledTask.timeout
+    end
+
+    def running_time
+      last_run_start.present? ? Time.zone.now - last_run_start : 0
+    end
   end
 end

data/lib/tasks_scheduler/version.rb

@@ -1,3 +1,3 @@
 module TasksScheduler
-  VERSION = '0.0.8'.freeze
+  VERSION = '0.0.9'.freeze
 end

data/test/models/scheduled_task_test.rb

@@ -51,6 +51,9 @@ class ScheduledTaskTest < ActiveSupport::TestCase
 
     @scheduled_task.send('status_on_end', StandardError.new('Test!'), ScheduledTask::STATUS_ABORTED)
     assert_equal ScheduledTask::STATUS_ABORTED, @scheduled_task.status
+
+    @scheduled_task.send('status_on_end', StandardError.new('Test!'), ScheduledTask::STATUS_TIMEOUT)
+    assert_equal ScheduledTask::STATUS_TIMEOUT, @scheduled_task.status
   end
 
   test 'task in list' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tasks_scheduler
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Eduardo H. Bogoni