tasks_scheduler 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 599df8db33d832f04a2ad1a0581c7775fbd17f345da397e6b2e6e14090dfe9d1
-  data.tar.gz: f20e6101384683f6d398ef55603f2a1d47d1e79dbf111237d68b2bfcc426292c
+  metadata.gz: 28ebfbf74a345e2c2e495dc2f5bb256f7180d4c58e31dd8575f70d23fe047933
+  data.tar.gz: a186a7918233e6287013b4cf6c956a4dcf09afcc459586a7a64a125908c4aacd
 SHA512:
-  metadata.gz: ca786519acd5d3925cc521ffed0f3d61471d409abefe94b70b32002951ce27d51cc63435567b2b820d7be7315265f7d7a847723ba721835246531fb391474539
-  data.tar.gz: 6e0e915ebd3b41d75499899b3155b33e71f34ad08fe80f03f30dc03dc75ead448acbd34dc71c6eb8ab38c8e9f49fd1c0f95c8922c4c76afb6ea9f3a30847368c
+  metadata.gz: 72198e57632d3ca14feedbb13e170fab472b52b4c9001b4b2649ff33fee266b64412b3897102f50cfd2a8d4b2284d3cc7a76244c96f424fcbd8b309085cbbe18
+  data.tar.gz: 848503897531631a676f7fa20fbaa8f252779c692f1e922f511350d667db5e2f52eb30dfdc5922b6fd0cf66ae952282da5de058dfa6d8530ab661c20af0e8ea4

data/app/assets/javascripts/tasks_scheduler.js

@@ -1,115 +1,4 @@
 //= require active_scaffold
 //= require js-routes
-
-function TasksScheduler() {
-}
-
-TasksScheduler.Status = function () {
-};
-
-// Shortcut
-var _S = TasksScheduler.Status;
-
-_S.initialized = false;
-
-_S.init = function (url, interval_max) {
-  if (!_S.initialized) {
-    _S.initialized = true;
-    _S.url = url;
-    _S.interval_max = interval_max;
-    _S.update();
-  }
-};
-
-_S.content = function () {
-  return $('#TaskScheduler_Status_Content');
-};
-
-_S.status = function () {
-  return $('#TaskScheduler_Status_Status');
-};
-
-_S.update_status = function () {
-  _S.status().html(
-    "Updating in " + _S.interval + " seconds..."
-  );
-};
-
-_S.check = function () {
-  if (_S.interval <= 0) {
-    _S.update();
-  } else {
-    _S.interval--;
-    _S.update_status();
-    setTimeout(_S.check, 1000);
-  }
-};
-
-_S.update = function () {
-  $.ajax({
-    url: _S.url,
-    success: function (result) {
-      _S.content().html(result);
-    },
-    complete: function (result) {
-      _S.interval = _S.interval_max + 1;
-      _S.last_update = new Date();
-      _S.check();
-    }
-  });
-};
-
-TasksScheduler.Alert = function () {
-};
-
-_A = TasksScheduler.Alert;
-
-_A.DEFAULT_REFRESH_INTERVAL = 5000;
-_A.DEFAULT_ELEMENT_SELECTOR = '#tasks_scheduler_alert';
-_A.CSS_CLASSES_PREFIX = 'alert_';
-_A.url = Routes.status_tasks_scheduler_daemon_path();
-
-_A.init = function (options) {
-  options = typeof options !== 'undefined' ? options : {};
-  $(document).ready(function () {
-    _A.options = options;
-    if (!_A.options.refresh_interval) {
-      _A.options.refresh_interval = _A.DEFAULT_REFRESH_INTERVAL;
-    }
-    if (!_A.options.element_selector) {
-      _A.options.element_selector = _A.DEFAULT_ELEMENT_SELECTOR;
-    }
-    _A.refresh();
-  });
-};
-
-_A.setNextRefresh = function () {
-  setTimeout(_A.refresh, _A.options.refresh_interval);
-};
-
-_A.refresh = function () {
-  $.ajax({
-    url: _A.url,
-    success: function (result) {
-      var alert = $(_A.options.element_selector);
-      var pattern = new RegExp('(^|\\s)' + _A.CSS_CLASSES_PREFIX + "\\S+", 'g');
-      alert.removeClass (function (index, className) {
-        return (className.match (pattern) || []).join(' ');
-      });
-      alert.addClass(_A.resultToCssClass(result));
-    },
-    complete: function (result) {
-      _A.setNextRefresh();
-    }
-  });
-};
-
-_A.resultToCssClass = function(result) {
-  var suffix = "ok"
-  if (!result.daemon_running) {
-    suffix = "daemon_stopped";
-  } else if (!result.tasks_all_ok) {
-    suffix = "task_failed";
-  }
-  return _A.CSS_CLASSES_PREFIX + suffix;
-};
+//= require tasks_scheduler/alert
+//= require tasks_scheduler/status

data/app/assets/javascripts/tasks_scheduler/alert.js

@@ -0,0 +1,62 @@
+if (typeof TasksScheduler == "undefined") {
+  TasksScheduler = function() {};
+}
+
+TasksScheduler.Alert = function () {
+};
+
+_A = TasksScheduler.Alert;
+
+_A.DEFAULT_REFRESH_INTERVAL = 5000;
+_A.DEFAULT_ELEMENT_SELECTOR = '#tasks_scheduler_alert';
+_A.CSS_CLASSES_PREFIX = 'alert_';
+_A.url = Routes.status_tasks_scheduler_daemon_path();
+
+_A.init = function (options) {
+  options = typeof options !== 'undefined' ? options : {};
+  $(document).ready(function () {
+    _A.options = options;
+    if (!_A.options.refresh_interval) {
+      _A.options.refresh_interval = _A.DEFAULT_REFRESH_INTERVAL;
+    }
+    if (!_A.options.element_selector) {
+      _A.options.element_selector = _A.DEFAULT_ELEMENT_SELECTOR;
+    }
+    _A.refresh();
+  });
+};
+
+_A.setNextRefresh = function () {
+  setTimeout(_A.refresh, _A.options.refresh_interval);
+};
+
+_A.refresh = function () {
+  $.ajax(_A.refreshAjaxData());
+};
+
+_A.refreshAjaxData = function () {
+  return {
+    url: _A.url,
+    success: function (result) {
+      var alert = $(_A.options.element_selector);
+      var pattern = new RegExp('(^|\\s)' + _A.CSS_CLASSES_PREFIX + "\\S+", 'g');
+      alert.removeClass (function (index, className) {
+        return (className.match (pattern) || []).join(' ');
+      });
+      alert.addClass(_A.resultToCssClass(result));
+    },
+    complete: function (result) {
+      _A.setNextRefresh();
+    }
+  };
+};
+
+_A.resultToCssClass = function(result) {
+  var suffix = "ok"
+  if (!result.daemon_running) {
+    suffix = "daemon_stopped";
+  } else if (!result.tasks_all_ok) {
+    suffix = "task_failed";
+  }
+  return _A.CSS_CLASSES_PREFIX + suffix;
+};

data/app/assets/javascripts/tasks_scheduler/status.js

@@ -0,0 +1,62 @@
+if (typeof TasksScheduler == "undefined") {
+  TasksScheduler = function() {};
+}
+
+TasksScheduler.Status = function () {
+};
+
+// Shortcut
+var _S = TasksScheduler.Status;
+
+_S.initialized = false;
+
+_S.init = function (url, interval_max) {
+  if (!_S.initialized) {
+    _S.initialized = true;
+    _S.url = url;
+    _S.interval_max = interval_max;
+    _S.update();
+  }
+};
+
+_S.content = function () {
+  return $('#TaskScheduler_Status_Content');
+};
+
+_S.status = function () {
+  return $('#TaskScheduler_Status_Status');
+};
+
+_S.update_status = function () {
+  _S.status().html(
+    "Updating in " + _S.interval + " seconds..."
+  );
+};
+
+_S.check = function () {
+  if (_S.interval <= 0) {
+    _S.update();
+  } else {
+    _S.interval--;
+    _S.update_status();
+    setTimeout(_S.check, 1000);
+  }
+};
+
+_S.update = function () {
+  $.ajax(_S.updateAjaxData());
+};
+
+_S.updateAjaxData = function() {
+  return {
+    url: _S.url,
+    success: function (result) {
+      _S.content().html(result);
+    },
+    complete: function (result) {
+      _S.interval = _S.interval_max + 1;
+      _S.last_update = new Date();
+      _S.check();
+    }
+  };
+};

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/config/routes.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 Rails.application.routes.draw do
-  resources(:scheduled_tasks) do
-    as_routes
+  concern :active_scaffold, ActiveScaffold::Routing::Basic.new(association: true)
+  resources(:scheduled_tasks, concerns: :active_scaffold) do
     collection do
       get :status
       get :status_content

data/db/migrate/20161122123828_create_scheduled_tasks.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class CreateScheduledTasks < (
-    Rails.version < '5.2' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
+    Rails.version < '5' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
   )
   def change
     create_table :scheduled_tasks do |t|

data/db/migrate/20161123130153_add_status_attributes_to_scheduled_tasks.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class AddStatusAttributesToScheduledTasks < (
-    Rails.version < '5.2' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
+    Rails.version < '5' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
   )
   def change
     add_column :scheduled_tasks, :last_run_start, :datetime

data/db/migrate/20161124200712_add_pid_to_scheduled_tasks.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class AddPidToScheduledTasks < (
-    Rails.version < '5.2' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
+    Rails.version < '5' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
   )
   def change
     add_column :scheduled_tasks, :pid, :integer

data/db/migrate/20161128163702_add_args_to_scheduled_tasks.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class AddArgsToScheduledTasks < (
-    Rails.version < '5.2' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
+    Rails.version < '5' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
   )
   def change
     add_column :scheduled_tasks, :args, :string

data/db/migrate/20180223155025_add_last_fail_status_to_scheduled_tasks.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class AddLastFailStatusToScheduledTasks < (
-    Rails.version < '5.2' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
+    Rails.version < '5' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
   )
   def change
     add_column :scheduled_tasks, :last_fail_status, :string

data/db/migrate/20180302170138_add_enabled_to_scheduled_tasks.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class AddEnabledToScheduledTasks < (
-    Rails.version < '5.2' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
+    Rails.version < '5' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
   )
   def change
     add_column :scheduled_tasks, :enabled, :boolean, null: false, default: true

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.0'
+  VERSION = '0.6.0'
 end

data/test/dummy/app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tasks_scheduler
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-21 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
@@ -161,12 +167,15 @@ files:
 - README.rdoc
 - Rakefile
 - app/assets/javascripts/tasks_scheduler.js
+- app/assets/javascripts/tasks_scheduler/alert.js
+- app/assets/javascripts/tasks_scheduler/status.js
 - app/assets/stylesheets/tasks_scheduler.scss
 - app/assets/stylesheets/tasks_scheduler/alert.scss
 - app/controllers/scheduled_tasks_controller.rb
 - 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
@@ -177,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
@@ -203,9 +211,11 @@ 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
+- test/dummy/app/assets/config/manifest.js
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
@@ -291,6 +301,7 @@ test_files:
 - 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/config/manifest.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/public/422.html

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>