tasks_scheduler 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48b30c798060f58365bfc12beb93db3972b529d9
-  data.tar.gz: 2b875abb3eb4984f7a3a59590a0911c5cefb48fc
+  metadata.gz: 92bc6ed859a0f11435e932c9e9d2054c53c1067e
+  data.tar.gz: acdf9fe30cbeb5a1f3cb7c74e4ffca03ecff4734
 SHA512:
-  metadata.gz: f7a07ad30c4510c9318231162c5c1f785ba398ab141e3bca282cac4d7560eca290aa450f1e7d4c181775679587637af36d1e3b0b56ed44d18005cb6304e15d93
-  data.tar.gz: 205d290aef278c20bfa4e57ec279f00ab7d54ff7ded576d8b23221e0aedb87c079175e8fbca9b8391e9e2bdb1d74cd320881f46e5796da6048b81ec6fed05863
+  metadata.gz: d96061f6d2ddda365979479751fdc427783d337ae8040b67203e5112be67015aa5b850f289eaa0b5ace1743bfe4811fb594d0898c338737820628cd7dd426095
+  data.tar.gz: fd2e663c7f5a202972116057e345b6a67c3f66feb15422a2ffc0ddb39eb421646c9a4f2880b5aa0c94187663a49ac13fb1b7b408bed6293c78b2b125353527a2

data/app/assets/stylesheets/tasks_scheduler.scss

@@ -26,6 +26,10 @@
     td.status_failed {
       color: red;
     }
+
+    td.status_aborted {
+      color: magenta;
+    }
   }
 
   .last_run {

data/app/controllers/scheduled_tasks_controller.rb

@@ -9,7 +9,7 @@ class ScheduledTasksController < ApplicationController
 
   active_scaffold :scheduled_task do |conf|
     [:create, :update, :list].each do |action|
-      conf.send(action).columns.exclude(:next_run, :last_run_start,
+      conf.send(action).columns.exclude(:next_run, :last_fail_status, :last_run_start,
                                         :last_run_successful_start, :last_run_unsuccessful_start,
                                         :last_run_successful_end, :last_run_unsuccessful_end,
                                         :pid)

data/app/models/scheduled_task/checker.rb

@@ -4,10 +4,25 @@ class ScheduledTask < ActiveRecord::Base
   module Checker
     def check
       check_banner
+      if pid.present?
+        check_on_pid_present
+      else
+        check_on_pid_not_present
+      end
+    end
+
+    private
+
+    def check_on_pid_present
       if process_running?
-        check_log("Already running (PID: #{pid})")
-        return
+        check_log('Already running')
+      else
+        check_log('Aborted')
+        on_end_running(Exception.new("Aborted (PID: #{pid} not found)"), STATUS_ABORTED)
       end
+    end
+
+    def check_on_pid_not_present
       if next_run.present?
         check_task_with_next_run
       else
@@ -15,14 +30,15 @@ class ScheduledTask < ActiveRecord::Base
       end
     end
 
-    private
-
     def check_log(message, method = :info)
       Rails.logger.send(method, "TASK_CHECK(#{id}): #{message}")
     end
 
     def check_banner
       check_log("Task: #{self}")
+      check_log("PID: #{pid}")
+      check_log("Running? #{process_running?}")
+      check_log("Last fail status: #{last_fail_status}")
     end
 
     def check_task_without_next_run
@@ -48,7 +64,7 @@ class ScheduledTask < ActiveRecord::Base
         spawn_pid = Process.spawn(*params)
       end
       Process.detach(spawn_pid)
-      update_attributes!(pid: spawn_pid)
+      update_attributes!(pid: spawn_pid, last_fail_status: nil)
     end
   end
 end

data/app/models/scheduled_task/runner.rb

@@ -6,18 +6,26 @@ class ScheduledTask < ActiveRecord::Base
       return if process_running? && pid != Process.pid
       status_on_start
       exception = invoke_task
+      on_end_running(exception, STATUS_FAILED)
+    end
+
+    private
+
+    def on_end_running(exception, last_fail_status)
       run_log(exception, :fatal) if exception
-      status_on_end(exception)
+      status_on_end(exception, last_fail_status)
       log_on_end(exception)
       run_log("Next run: #{next_run.in_time_zone}")
     end
 
-    private
-
     def run_log(message, method = :info)
       if message.is_a?(Exception)
         run_log("#{message.class}: #{message.message}")
-        run_log(message.backtrace.join("\n"))
+        if message.backtrace.present?
+          run_log(message.backtrace.join("\n"))
+        else
+          run_log('No backtrace present')
+        end
       else
         Rails.logger.send(method, "TASK_RUN(#{id}): #{message}")
       end

data/app/models/scheduled_task/status.rb

@@ -3,8 +3,8 @@ class ScheduledTask < ActiveRecord::Base
     def status
       return STATUS_RUNNING if running?
       return STATUS_WAITING if waiting?
-      return STATUS_FAILED if failed?
-      fail "Unknown status (#{status_attributes_values})"
+      return last_fail_status if last_fail_status.present?
+      raise "Unknown status (#{status_attributes_values})"
     end
 
     def running?
@@ -16,27 +16,24 @@ class ScheduledTask < ActiveRecord::Base
       status_attributes.all? { |a| send(a).blank? }
     end
 
-    def failed?
-      ended?(last_run_unsuccessful_end, last_run_successful_end)
-    end
+    private
 
     def ended?(time, oposite_time)
       !running? && time.present? && (oposite_time.blank? || oposite_time < time)
     end
 
-    private
-
     def status_on_start
       update_attributes!(last_run_start: Time.zone.now)
     end
 
-    def status_on_end(exception)
+    def status_on_end(exception, last_fail_status)
       update_attributes!(
         next_run: calculate_next_run,
         (exception ? :last_run_unsuccessful_start : :last_run_successful_start) => last_run_start,
         (exception ? :last_run_unsuccessful_end : :last_run_successful_end) => Time.zone.now,
         last_run_start: nil,
-        pid: nil
+        pid: nil,
+        last_fail_status: exception ? last_fail_status : nil
       )
     end
 

data/app/models/scheduled_task.rb

@@ -15,12 +15,16 @@ class ScheduledTask < ActiveRecord::Base
     end
   end
 
-  validates :scheduling, presence: true, 'tasks_scheduler/cron_scheduling': true
-  validates :task, presence: true, inclusion: { in: rake_tasks }
-
   STATUS_RUNNING = 'running'
   STATUS_FAILED = 'failed'
   STATUS_WAITING = 'waiting'
+  STATUS_ABORTED = 'aborted'
+
+  LAST_FAIL_STATUSES = [STATUS_FAILED, STATUS_ABORTED]
+
+  validates :scheduling, presence: true, 'tasks_scheduler/cron_scheduling': true
+  validates :task, presence: true, inclusion: { in: rake_tasks }
+  validates :last_fail_status, allow_blank: true, inclusion: { in: LAST_FAIL_STATUSES }
 
   LOG_RUNNING = 'running'
   LOG_SUCCESSFUL = 'successful'

data/db/migrate/20180223155025_add_last_fail_status_to_scheduled_tasks.rb

@@ -0,0 +1,5 @@
+class AddLastFailStatusToScheduledTasks < ActiveRecord::Migration
+  def change
+    add_column :scheduled_tasks, :last_fail_status, :string
+  end
+end

data/lib/tasks_scheduler/version.rb

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

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20161128163702) do
+ActiveRecord::Schema.define(version: 20180223155025) do
 
   create_table "scheduled_tasks", force: :cascade do |t|
     t.string   "scheduling"
@@ -26,6 +26,7 @@ ActiveRecord::Schema.define(version: 20161128163702) do
     t.datetime "last_run_unsuccessful_end"
     t.integer  "pid"
     t.string   "args"
+    t.string   "last_fail_status"
   end
 
 end

data/test/models/scheduled_task_test.rb

@@ -40,14 +40,17 @@ class ScheduledTaskTest < ActiveSupport::TestCase
     @scheduled_task.send('status_on_start')
     assert_equal ScheduledTask::STATUS_RUNNING, @scheduled_task.status
 
-    @scheduled_task.send('status_on_end', nil)
+    @scheduled_task.send('status_on_end', nil, nil)
     assert_equal ScheduledTask::STATUS_WAITING, @scheduled_task.status
 
     @scheduled_task.send('status_on_start')
     assert_equal ScheduledTask::STATUS_RUNNING, @scheduled_task.status
 
-    @scheduled_task.send('status_on_end', StandardError.new('Test!'))
+    @scheduled_task.send('status_on_end', StandardError.new('Test!'), ScheduledTask::STATUS_FAILED)
     assert_equal ScheduledTask::STATUS_FAILED, @scheduled_task.status
+
+    @scheduled_task.send('status_on_end', StandardError.new('Test!'), ScheduledTask::STATUS_ABORTED)
+    assert_equal ScheduledTask::STATUS_ABORTED, @scheduled_task.status
   end
 
   test 'task in list' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tasks_scheduler
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-05 00:00:00.000000000 Z
+date: 2018-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_scaffold
@@ -117,6 +117,7 @@ files:
 - db/migrate/20161123130153_add_status_attributes_to_scheduled_tasks.rb
 - db/migrate/20161124200712_add_pid_to_scheduled_tasks.rb
 - db/migrate/20161128163702_add_args_to_scheduled_tasks.rb
+- db/migrate/20180223155025_add_last_fail_status_to_scheduled_tasks.rb
 - exe/tasks_scheduler
 - exe/tasks_scheduler_run_task
 - lib/tasks_scheduler.rb
@@ -184,46 +185,46 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Scheduler for Rake tasks.
 test_files:
-- test/dummy/Rakefile
-- test/dummy/README.rdoc
+- test/fixtures/scheduled_tasks.yml
+- test/models/scheduled_task_test.rb
 - test/dummy/config.ru
+- test/dummy/README.rdoc
+- test/dummy/db/schema.rb
+- test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/assets/javascripts/application.js
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/bin/bundle
+- test/dummy/bin/rails
+- test/dummy/bin/setup
+- test/dummy/bin/rake
+- test/dummy/Rakefile
+- test/dummy/config/environments/production.rb
+- test/dummy/config/environments/test.rb
+- test/dummy/config/environments/development.rb
+- test/dummy/config/application.rb
 - test/dummy/config/boot.rb
-- test/dummy/config/database.yml
-- test/dummy/config/secrets.yml
 - test/dummy/config/locales/en.yml
-- test/dummy/config/application.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environment.rb
-- test/dummy/config/routes.rb
-- test/dummy/config/initializers/assets.rb
-- test/dummy/config/initializers/cookies_serializer.rb
-- test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/initializers/filter_parameter_logging.rb
+- test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/assets.rb
+- test/dummy/config/initializers/cookies_serializer.rb
 - test/dummy/config/initializers/mime_types.rb
-- test/dummy/db/schema.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/assets/javascripts/application.js
+- test/dummy/config/secrets.yml
+- test/dummy/config/database.yml
+- test/dummy/config/routes.rb
+- test/dummy/config/environment.rb
 - test/dummy/public/422.html
-- test/dummy/public/404.html
 - test/dummy/public/favicon.ico
+- test/dummy/public/404.html
 - test/dummy/public/500.html
-- test/dummy/bin/bundle
-- test/dummy/bin/setup
-- test/dummy/bin/rails
-- test/dummy/bin/rake
 - test/test_helper.rb
-- test/fixtures/scheduled_tasks.yml
-- test/models/scheduled_task_test.rb