tasks_scheduler 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ffe5fd69eab67510ab378506158799d08b21d4577ed368ddbadf12cfb0a6957
-  data.tar.gz: e471eaeb074d10557c8c3bd55dff0d8bbd0a9e1b83723d28f6255b2b2907fe29
+  metadata.gz: 89877b670ebd68e63175333d60bce49d90de7c4e04737189f5c73a6a277f0595
+  data.tar.gz: 18d4d5224dcabd9dd2238d0cc8a5dea03689d58323de808b5bb4622664a2cc01
 SHA512:
-  metadata.gz: 435c0e3aa4e1c7a721933b6a47bd3b72f33ab51d5a5c67323cee7a179c2aef731bc6a39119763fa169c064670883a50728703c1ad37614c9d7996ba7b7993336
-  data.tar.gz: 9112b3ad93fd00dfc3d10d8487befc0c698461d046a8fdeead98611c86ecdd0d4f44dcb929864fa53e95fcf409fedd9eefcd85abe7ccf0817269f44d50b2b3df
+  metadata.gz: 6bb72a00e15bd394f6baa9cbae395e8737295ff72f1177315fd15937b2b60189901b7db0cfe3c2b7b9daf08599023c694558231539d1f6e2b92ea4f6fd0bd2a4
+  data.tar.gz: 766a81812effee371317d38ee615e0e5b57400abac7d6a376a6a5971bc98fc301bdca3e03dbfa3c8f1d3f1c7903ddbdf479fc7b89451292880c386c813311b69

data/app/controllers/tasks_scheduler_daemon_controller.rb

@@ -1,4 +1,8 @@
+require 'tasks_scheduler/checker'
+
 class TasksSchedulerDaemonController < ApplicationController
+  require_relative 'tasks_scheduler_daemon_controller/_download_log'
+
   def index
   end
 
@@ -11,24 +15,4 @@ class TasksSchedulerDaemonController < ApplicationController
     render json: { daemon_running: ::TasksScheduler::Daemon.running?,
                    tasks_all_ok: !::ScheduledTask.all.any?(&:failed?) }
   end
-
-  def download_log
-    if File.exist?(::TasksScheduler::Checker.instance.log_path)
-      send_log_file
-    else
-      redirect_to(tasks_scheduler_daemon_path,
-                  notice: "Arquivo \"#{::TasksScheduler::Checker.instance.log_path}\" não existe")
-    end
-  end
-
-  private
-
-  def send_log_file
-    send_file(
-      ::TasksScheduler::Checker.instance.log_path,
-      filename: "#{request.base_url.parameterize}_tasks-scheduler_checker-log_" \
-        "#{Time.zone.now.to_s.parameterize}.log",
-      type: 'text/plain'
-    )
-  end
 end

data/app/controllers/tasks_scheduler_daemon_controller/_download_log.rb

@@ -0,0 +1,36 @@
+class TasksSchedulerDaemonController < ApplicationController
+  def download_log
+    return unless download_log_validate_log_key
+    log = ::TasksScheduler::Checker.instance.send("#{download_log_key}_log")
+    return unless download_log_validate_log_exist(log)
+    send_log_file(log)
+  end
+
+  private
+
+  def download_log_key
+    params[:log_key]
+  end
+
+  def download_log_validate_log_key
+    return true if ::TasksScheduler::Checker::LOGS_KEYS.include?(download_log_key)
+    redirect_to(tasks_scheduler_daemon_path,
+                notice: "Invalid log key: \"#{download_log_key}\"")
+    false
+  end
+
+  def download_log_validate_log_exist(log)
+    return true if log.exist?
+    redirect_to(tasks_scheduler_daemon_path, notice: "Log \"#{log.key}\" does not exist.")
+    false
+  end
+
+  def send_log_file(log)
+    send_file(
+      log.path,
+      filename: "#{request.base_url.parameterize}_tasks-scheduler_checker-log_" \
+        "#{Time.zone.now.to_s.parameterize}.log",
+      type: 'text/plain'
+    )
+  end
+end

data/app/models/scheduled_task.rb

@@ -37,9 +37,11 @@ class ScheduledTask < ActiveRecord::Base
   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 }
+  validates :task, presence: true
   validates :last_fail_status, allow_blank: true, inclusion: { in: LAST_FAIL_STATUSES }
 
+  validate :validate_task
+
   LOG_RUNNING = 'running'
   LOG_SUCCESSFUL = 'successful'
   LOG_UNSUCCESSFUL = 'unsuccessful'
@@ -76,4 +78,15 @@ class ScheduledTask < ActiveRecord::Base
   rescue
     raise "Unable to determine status for #{pid}"
   end
+
+  def task_exist?
+    self.class.rake_tasks.include?(task)
+  end
+
+  def validate_task
+    return if task.blank?
+    return unless task_changed?
+    return if self.class.rake_tasks.include?(task)
+    errors.add(:task, "Task \"#{task}\" not found")
+  end
 end

data/app/models/scheduled_task/checker.rb

@@ -60,7 +60,9 @@ class ScheduledTask < ActiveRecord::Base
     end
 
     def check_task_with_next_run
-      if next_run < Time.zone.now
+      if !task_exist?
+        check_log("Task does not exist: #{task}")
+      elsif next_run < Time.zone.now
         check_log('Next run reached. Running...')
         spawn_task
       else
@@ -70,7 +72,7 @@ class ScheduledTask < ActiveRecord::Base
 
     def spawn_task
       params = ['bundle', 'exec', 'tasks_scheduler_run_task', id.to_s]
-      check_log("Spawn command: #{params}")
+      check_log("Spawn command: #{params} (Task: #{task})")
       spawn_pid = nil
       Dir.chdir(Rails.root) do
         spawn_pid = Process.spawn(*params)

data/app/models/scheduled_task/log.rb

@@ -23,9 +23,12 @@ class ScheduledTask < ActiveRecord::Base
     end
 
     def log_on_end(exception)
-      target_log = exception ? log_file(LOG_UNSUCCESSFUL) : log_file(LOG_SUCCESSFUL)
-      File.unlink(target_log) if File.exist?(target_log)
-      File.rename(log_file(LOG_RUNNING), target_log)
+      running_log = log_file(LOG_RUNNING)
+      if ::File.exist?(running_log)
+        target_log = exception ? log_file(LOG_UNSUCCESSFUL) : log_file(LOG_SUCCESSFUL)
+        File.unlink(target_log) if File.exist?(target_log)
+        File.rename(running_log, target_log)
+      end
     end
   end
 end

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

@@ -2,6 +2,7 @@
   <strong>Last update: </strong>
   <%= I18n.l(Time.zone.now, format: :short) %>
   <br/>
+  <strong>Daemon status: </strong>
   <%= render partial: '/tasks_scheduler_daemon/running_status' %>
 </p>
 <table>

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

@@ -0,0 +1,11 @@
+<h3>Daemon</h3>
+<p>
+  <strong>Status: </strong>
+  <%= render partial: '/tasks_scheduler_daemon/running_status' %>
+  <br/>
+  <strong>Actions: </strong>
+  <%= safe_join(::TasksScheduler::Daemon::ACTIONS.map do |action|
+      link_to action, execute_tasks_scheduler_daemon_path(action), method: :post
+      end, ' | ') %>
+  <br/>
+</p>

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

@@ -0,0 +1,12 @@
+<h3>Logs</h3>
+<ul>
+  <% ::TasksScheduler::Checker.instance.logs.each do |log| %>
+    <li>
+      <% if log.exist? %>
+        <%= link_to log.key, download_log_tasks_scheduler_daemon_path(log.key) %>
+      <% else %>
+        <span style="color: grey" title='Log "<%= log.key %>" does not exist.'><%= log.key %></span>
+      <% end %>
+    </li>
+  <% end %>
+</ul>

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

@@ -0,0 +1,9 @@
+<% if @result %>
+  <h3>Results</h3>
+  <dl>
+    <% @result.each do |k, v| %>
+      <dt><%= k %></dt>
+      <dd><%= v.present? ? v : '-' %></dd>
+    <% end %>
+  </dl>
+<% end %>

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

@@ -1,4 +1,3 @@
-<strong>Daemon status: </strong>
 <% if TasksScheduler::Daemon.running? %>
   <span class="tasks_scheduler_daemon_status_up">UP</span>
 <% else %>

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

@@ -1,22 +1,5 @@
 <%= render partial: '/tasks_scheduler/navbar' %>
 <h2><%= I18n.t(:tasks_scheduler_daemon) %></h2>
-<p>
-  <%= render partial: '/tasks_scheduler_daemon/running_status' %>
-  <br/>
-  <strong>Actions: </strong>
-  <%= safe_join(::TasksScheduler::Daemon::ACTIONS.map do |action|
-      link_to action, execute_tasks_scheduler_daemon_path(action), method: :post
-    end, ' | ') %>
-  <br/>
-  <strong>Log: </strong>
-  <%= link_to 'download', download_log_tasks_scheduler_daemon_path %>
-</p>
-<% if @result %>
-  <h3>Results</h3>
-  <dl>
-    <% @result.each do |k, v| %>
-      <dt><%= k %></dt>
-      <dd><%= v.present? ? v : '-' %></dd>
-    <% end %>
-  </dl>
-<% end %>
+<%= render partial: 'daemon', locals: {status_label: 'Status:'} %>
+<%= render partial: 'logs' %>
+<%= render partial: 'results' %>

data/config/routes.rb

@@ -15,6 +15,6 @@ Rails.application.routes.draw do
        to: 'tasks_scheduler_daemon#execute', as: :execute_tasks_scheduler_daemon
   get '/tasks_scheduler_daemon/status', to: 'tasks_scheduler_daemon#status',
                                         as: :status_tasks_scheduler_daemon
-  get '/tasks_scheduler_daemon/download_log', to: 'tasks_scheduler_daemon#download_log',
-                                              as: :download_log_tasks_scheduler_daemon
+  get '/tasks_scheduler_daemon/download_log/:log_key', to: 'tasks_scheduler_daemon#download_log',
+                                                       as: :download_log_tasks_scheduler_daemon
 end

data/lib/tasks_scheduler/checker.rb

@@ -1,9 +1,12 @@
+require 'tasks_scheduler/checker/log'
+
 module TasksScheduler
   class Checker
     include Singleton
 
     CHECK_INTERVAL = 15
     LOG_ON_FILE_ENV_KEY = 'TASKS_SCHEDULER_LOG_ON_FILE'.freeze
+    LOGS_KEYS = %w(rails stdout stderr).freeze
 
     def run
       check_log
@@ -18,15 +21,28 @@ module TasksScheduler
     end
 
     def log_path
-      ::Rails.root.join('log', 'tasks_scheduler', 'checker.log')
+      rais_log.path
+    end
+
+    def logs
+      LOGS_KEYS.map { |key| send("#{key}_log") }
+    end
+
+    LOGS_KEYS.each do |log_key|
+      class_eval <<CODE, __FILE__, __LINE__ + 1
+      def #{log_key}_log
+        @#{log_key}_log ||= ::TasksScheduler::Checker::Log.new('#{log_key}')
+      end
+CODE
     end
 
     private
 
     def check_log
       return unless log_on_file?
-      ::FileUtils.mkdir_p(File.dirname(log_path))
-      ::Rails.logger = ::Logger.new(log_path)
+      ::Rails.logger = ::Logger.new(rails_log.path)
+      $stdout.reopen(stdout_log.path, 'w')
+      $stderr.reopen(stderr_log.path, 'w')
     end
 
     def log_on_file?

data/lib/tasks_scheduler/checker/log.rb

@@ -0,0 +1,32 @@
+require 'fileutils'
+
+module TasksScheduler
+  class Checker
+    class Log
+      class << self
+        def logs_directory
+          @logs_directory ||= ::Rails.root.join('log', 'tasks_scheduler', 'checker')
+        end
+      end
+
+      attr_reader :key
+
+      def initialize(key)
+        @key = key
+        ::FileUtils.mkdir_p(dirname)
+      end
+
+      def dirname
+        ::File.dirname(path)
+      end
+
+      def exist?
+        ::File.exist?(path)
+      end
+
+      def path
+        self.class.logs_directory.join("#{key}.log")
+      end
+    end
+  end
+end

data/lib/tasks_scheduler/version.rb

@@ -1,3 +1,3 @@
 module TasksScheduler
-  VERSION = '0.2.3'.freeze
+  VERSION = '0.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tasks_scheduler
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-02 00:00:00.000000000 Z
+date: 2019-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_scaffold
@@ -111,6 +111,7 @@ files:
 - 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/models/scheduled_task.rb
 - app/models/scheduled_task/checker.rb
@@ -123,6 +124,9 @@ files:
 - 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
 - app/views/tasks_scheduler_daemon/_running_status.html.erb
 - app/views/tasks_scheduler_daemon/index.html.erb
 - config/initializers/assets.rb
@@ -139,6 +143,7 @@ files:
 - exe/tasks_scheduler_run_task
 - lib/tasks_scheduler.rb
 - lib/tasks_scheduler/checker.rb
+- lib/tasks_scheduler/checker/log.rb
 - lib/tasks_scheduler/cron_parser_patch.rb
 - lib/tasks_scheduler/cron_scheduling_validator.rb
 - lib/tasks_scheduler/daemon.rb