tasks_scheduler 0.5.4 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75a6de697f21d110f7bd19830666b84ebc8f6bceddebfe7b5690b7fcbfc362d0
-  data.tar.gz: 59ca3d0f8830902424d1a3ff3927d16b1b1a13513b3f9b7f1d02865e07e64c90
+  metadata.gz: 28ebfbf74a345e2c2e495dc2f5bb256f7180d4c58e31dd8575f70d23fe047933
+  data.tar.gz: a186a7918233e6287013b4cf6c956a4dcf09afcc459586a7a64a125908c4aacd
 SHA512:
-  metadata.gz: fb5b96594aec114c1e8f3f08ed6fa03d638eb869fc9ef8c4cec3fb7b24f765945e879cf97597142726746a2709bf65733b800454477da2dd8378a419c6882376
-  data.tar.gz: 38f1f53610c2830ba8e2deeed0ad32bd9a21165926cf92bc898291303829bd3843917c83c647e667478361540b59dfd3bed1dbc4482fc3a4342dda5c818d3f0c
+  metadata.gz: 72198e57632d3ca14feedbb13e170fab472b52b4c9001b4b2649ff33fee266b64412b3897102f50cfd2a8d4b2284d3cc7a76244c96f424fcbd8b309085cbbe18
+  data.tar.gz: 848503897531631a676f7fa20fbaa8f252779c692f1e922f511350d667db5e2f52eb30dfdc5922b6fd0cf66ae952282da5de058dfa6d8530ab661c20af0e8ea4

data/app/helpers/tasks_scheduler_helper.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module TasksSchedulerHelper
+  NAVBAR_ENTRIES = {
+    tasks_scheduler_daemon: 'tasks_scheduler_daemon',
+    scheduled_tasks: 'scheduled_tasks',
+    tasks_scheduler_status: :status_scheduled_tasks
+  }.freeze
+
+  def tasks_scheduler_navbar
+    content_tag(:navbar) do
+      safe_join(tasks_scheduler_navbar_entries.map { |label, path| link_to label, path }, ' | ')
+    end
+  end
+
+  def tasks_scheduler_navbar_entries
+    NAVBAR_ENTRIES
+      .map { |i18n_key, path_name| [::I18n.t(i18n_key), send("#{path_name}_path")] }
+      .to_h
+  end
+end

data/app/models/scheduled_task/checker.rb

@@ -61,6 +61,8 @@ class ScheduledTask < ActiveRecord::Base
       check_log("Running? #{process_running?}")
       check_log("Last fail status: #{last_fail_status}")
       check_log("Enabled: #{enabled?}")
+      check_log("Tasks running: #{::TasksScheduler::Info.tasks_running_current}/" +
+        ::TasksScheduler::Info.tasks_running_limit.to_s)
     end
 
     def check_task_without_next_run
@@ -72,11 +74,13 @@ class ScheduledTask < ActiveRecord::Base
     def check_task_with_next_run
       if !task_exist?
         check_on_task_not_exist
-      elsif next_run < Time.zone.now
+      elsif next_run >= Time.zone.now
+        check_log('Next run not reached')
+      elsif !::TasksScheduler::Info.can_run_new_task?
+        check_log('Running tasks limit reached. Waiting...')
+      else
         check_log('Next run reached. Running...')
         spawn_task
-      else
-        check_log('Next run not reached')
       end
     end
 

data/app/views/scheduled_tasks/list.html.erb

@@ -1,2 +1,2 @@
-<%= render partial: '/tasks_scheduler/navbar' %>
+<%= tasks_scheduler_navbar %>
 <%=  render :super %>

data/app/views/scheduled_tasks/log.html.erb

@@ -1,3 +1,4 @@
+<%= tasks_scheduler_navbar %>
 <p>Log file: <%= @log_file %></p>
 <% if File.exist?(@log_file) %>
   <p>Content: </p>

data/app/views/scheduled_tasks/status.html.erb

@@ -1,4 +1,4 @@
-<%= render partial: '/tasks_scheduler/navbar' %>
+<%= tasks_scheduler_navbar %>
 <h2><%=  I18n.t(:tasks_scheduler_status) %></h2>
 <div id="TaskScheduler_Status_Status">
 </div>

data/app/views/scheduled_tasks/status_content.html.erb

@@ -4,6 +4,10 @@
   <br/>
   <strong>Daemon status: </strong>
   <%= render partial: '/tasks_scheduler_daemon/running_status' %>
+  <br/>
+  <strong>Tasks running/limit: </strong>
+  <%= ::TasksScheduler::Info.tasks_running_current %> /
+  <%= ::TasksScheduler::Info.tasks_running_limit %>
 </p>
 <table>
   <thead>

data/app/views/tasks_scheduler_daemon/index.html.erb

@@ -1,4 +1,4 @@
-<%= render partial: '/tasks_scheduler/navbar' %>
+<%= tasks_scheduler_navbar %>
 <h2><%= I18n.t(:tasks_scheduler_daemon) %></h2>
 <%= render partial: 'daemon', locals: {status_label: 'Status:'} %>
 <%= render partial: 'logs' %>

data/lib/tasks_scheduler/checker.rb

@@ -16,7 +16,7 @@ module TasksScheduler
       Signal.trap('TERM') { running = false }
       while running
         Rails.logger.info('Checking all tasks...')
-        ::ScheduledTask.all.each(&:check)
+        ::ScheduledTask.all.order(next_run: :asc).each(&:check)
         Rails.logger.info("All tasks checked. Sleeping for #{CHECK_INTERVAL} second(s)...")
         sleep(CHECK_INTERVAL)
       end

data/lib/tasks_scheduler/info.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module TasksScheduler
+  class Info
+    TASKS_LIMIT_KEY = 'TASKS_SCHEDULER_TASKS_LIMIT'
+    TASKS_LIMIT_DEFAULT_VALUE = '-1'
+
+    class << self
+      def can_run_new_task?
+        return true if tasks_running_limit.negative?
+
+        tasks_running_current < tasks_running_limit
+      end
+
+      def tasks_running_current
+        ::ScheduledTask.all.select(&:process_running?).count
+      end
+
+      def tasks_running_limit
+        ENV[TASKS_LIMIT_KEY].if_present(TASKS_LIMIT_DEFAULT_VALUE, &:to_i)
+      end
+    end
+  end
+end

data/lib/tasks_scheduler/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TasksScheduler
-  VERSION = '0.5.4'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tasks_scheduler
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-14 00:00:00.000000000 Z
+date: 2020-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_scaffold
@@ -64,14 +64,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.43'
+        version: '0.56'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.56.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.43'
+        version: '0.56'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.56.1
 - !ruby/object:Gem::Dependency
   name: js-routes
   requirement: !ruby/object:Gem::Requirement
@@ -106,14 +112,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.11.3
+        version: 4.2.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.11.3
+        version: 4.2.11
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -169,6 +175,7 @@ files:
 - app/controllers/tasks_scheduler_daemon_controller.rb
 - app/controllers/tasks_scheduler_daemon_controller/_download_log.rb
 - app/helpers/scheduled_tasks_helper.rb
+- app/helpers/tasks_scheduler_helper.rb
 - app/models/scheduled_task.rb
 - app/models/scheduled_task/checker.rb
 - app/models/scheduled_task/log.rb
@@ -179,7 +186,6 @@ files:
 - app/views/scheduled_tasks/status.html.erb
 - app/views/scheduled_tasks/status_content.html.erb
 - app/views/tasks_scheduler/_alert.html.erb
-- app/views/tasks_scheduler/_navbar.html.erb
 - app/views/tasks_scheduler_daemon/_daemon.html.erb
 - app/views/tasks_scheduler_daemon/_logs.html.erb
 - app/views/tasks_scheduler_daemon/_results.html.erb
@@ -205,6 +211,7 @@ files:
 - lib/tasks_scheduler/cron_scheduling_validator.rb
 - lib/tasks_scheduler/daemon.rb
 - lib/tasks_scheduler/engine.rb
+- lib/tasks_scheduler/info.rb
 - lib/tasks_scheduler/version.rb
 - test/dummy/README.rdoc
 - test/dummy/Rakefile

data/app/views/tasks_scheduler/_navbar.html.erb

@@ -1,5 +0,0 @@
-<navbar>
-  <%= link_to I18n.t(:tasks_scheduler_daemon), tasks_scheduler_daemon_path  %> |
-  <%= link_to I18n.t(:scheduled_tasks), scheduled_tasks_path  %> |
-  <%= link_to I18n.t(:tasks_scheduler_status), status_scheduled_tasks_path  %>
-</navbar>