web47core 2.0.0 → 3.0.0

data/app/views/cron/_index.html.haml

@@ -1,70 +1,77 @@
-- title t('.title')
+- title t('cron.index.title')
 .container
   .row
     .col.s12
-      %ul.tabs#stack_cron
-        %li.tab.col.s6
-          %a{href: '#cron_job_servers'}='Cron Servers'
-        %li.tab.col.s6
-          %a{href: '#job_cron_tabs'}='Cron Jobs'
-  .row
-    .col.s12
-      #cron_job_servers.col.s12{data: {cache: 'stack_cron'}}
-        %table.highlight.bordered.extended
-          %thead
-            %tr
-              %th.center-align= t('.host')
-              %th.center-align= t('.state')
-              %th.center-align= t('.last_check_in_at')
-              %th.center-align= t('.actions')
-          %tbody.white-text
-            - Cron::Server.all.each do |server|
-              %tr{class: server.alive? ? 'green lighten-1' : 'red lighten-1'}
-                %td="#{server.host_name}:#{server.pid}"
-                %td.center-align
-                  - if server.primary?
-                    %i.material-icons.white-text
-                      grade
-                  - else
-                     
-                %td=l(server.last_check_in_at, format: :medium)
-                %td.center-align
-                  - if can? :manage, server
-                    .actions
-                      - if server.primary?
-                        = action_link_tag(can?(:manage, Cron::Server), model_action_path(server, :demote), icon_name: 'thumb_down' )
-                      - else
-                        = delete_link_tag(server, model_path(server))
-      #job_cron_tabs.col.s12{data: {cache: 'stack_cron'}}
-        %table.highlight.bordered.extended
-          %thead
-            %tr
-              %th=t('.name')
-              %th=t('.last_run_at')
-              %th=t('.min')
-              %th=t('.hour')
-              %th=t('.mday')
-              %th=t('.month')
-              %th=t('.wday')
-              %th=t('.enabled')
-              %th=t('.actions')
-          %tbody
-            - Cron::JobTab.matching_search_text(params[:search]).each do |cron_tab|
-              %tr
-                %td.name=cron_tab.name.humanize
-                %td=current_user.local_time(cron_tab.last_run_at)
-                %td=cron_tab.min
-                %td=cron_tab.hour
-                %td=cron_tab.mday
-                %td=cron_tab.month
-                %td=cron_tab.wday
-                %td
-                  - if cron_tab.valid_environment?
-                    %i.material-icons.green-text
-                      check
-                  - else
-                    %nbsp
-                %td.actions
-                  = edit_link_tag(cron_tab, edit_model_path(cron_tab))
-                  - if cron_tab.valid_environment?
-                    = replay_link_tag(cron_tab, model_action_path(cron_tab, :run_now), icon_name: 'directions_run', confirm: t('.confirm', name: cron_tab.name.humanize))
+      .card
+        .card-content
+          .card-title= t('cron.index.title')
+      .card.section-data-tables
+        .card-content
+          %ul.tabs#stack_cron
+            %li.tab.col.s6
+              %a{href: '#cron_job_servers'}='Cron Servers'
+            %li.tab.col.s6
+              %a{href: '#job_cron_tabs'}='Cron Jobs'
+          .container
+            .row
+              .col.s12
+                #cron_job_servers{data: {cache: 'stack_cron'}}
+                  %table.highlight.data-table
+                    %thead
+                      %tr
+                        = table_header_tag :host
+                        = table_header_tag :state, priority: 3
+                        = table_header_tag :last_check_in_at, priority: 4
+                        = table_header_actions_tag
+                    %tbody.white-text
+                      - Cron::Server.all.each do |server|
+                        %tr{class: server.alive? ? 'green lighten-1' : 'red lighten-1'}
+                          %td="#{server.host_name}:#{server.pid}"
+                          %td.center-align
+                            - if server.primary?
+                              %i.material-icons.white-text
+                                grade
+                            - else
+                               
+                          %td=current_user.local_time(server.last_check_in_at)
+                          %td.center-align
+                            - if can? :manage, server
+                              .actions
+                                - if server.primary?
+                                  = action_link_tag(can?(:manage, Cron::Server), model_action_path(server, :demote), icon_name: 'thumb_down' )
+                                - else
+                                  = delete_link_tag(server, model_path(server))
+              .col.s12
+                #job_cron_tabs{data: {cache: 'stack_cron'}}
+                  %table.highlight.data-table
+                    %thead
+                      %tr
+                        = table_header_tag :name
+                        = table_header_tag :last_run_at, priority: 4
+                        = table_header_tag :min, priority: 5
+                        = table_header_tag :hour, priority: 6
+                        = table_header_tag :mday, priority: 7
+                        = table_header_tag :month, priority: 8
+                        = table_header_tag :wday, priority: 9
+                        = table_header_tag :enabled, priority: 3
+                        = table_header_actions_tag
+                    %tbody
+                      - Cron::JobTab.matching_search_text(params[:search]).each do |cron_tab|
+                        %tr
+                          %td.name=cron_tab.name.humanize
+                          %td=current_user.local_time(cron_tab.last_run_at)
+                          %td=cron_tab.min
+                          %td=cron_tab.hour
+                          %td=cron_tab.mday
+                          %td=cron_tab.month
+                          %td=cron_tab.wday
+                          %td
+                            - if cron_tab.valid_environment?
+                              %i.material-icons.green-text
+                                check
+                            - else
+                              %nbsp
+                          %td.actions
+                            = edit_link_tag(cron_tab, edit_model_path(cron_tab))
+                            - if cron_tab.valid_environment?
+                              = replay_link_tag(cron_tab, model_action_path(cron_tab, :run_now), icon_name: 'directions_run', confirm: t('.confirm', name: cron_tab.name.humanize))

data/app/views/delayed_job_metrics/_index.html.haml

@@ -0,0 +1,27 @@
+- title t('.title')
+.container
+  .row
+    .s12
+      .card.section-data-tables
+        .card-content
+          %table.highlight.data-table
+            %thead
+              %tr
+                =table_header_tag :name
+                =table_header_tag :count, priority: 3
+                =table_header_tag :min, priority: 5
+                =table_header_tag :avg, priority: 5
+                =table_header_tag :max, priority: 5
+                =table_header_tag :last_run_at, priority: 4
+                =table_header_actions_tag
+            %tbody
+              - @metrics.each do |metric|
+                %tr
+                  %td=metric.name
+                  %td=metric.count
+                  %td=metric.min.round(3)
+                  %td=metric.avg.round(3)
+                  %td=metric.max.round(3)
+                  %td=current_user.local_time(metric.last_run_at)
+                  %td.actions
+                    = delete_link_tag(metric, model_path(metric))

data/app/views/delayed_job_metrics/index.html.haml

@@ -0,0 +1 @@
+=render 'index'

data/app/views/delayed_job_workers/_index.html.haml

@@ -0,0 +1,27 @@
+- title t('.title')
+.container
+  .row
+    .s12
+      .card.section-data-tables
+        .card-content
+          %table.highlight.data-table
+            %thead
+              %tr
+                =table_header_tag :host_name, priority: 3
+                =table_header_tag :pid, priority: 3
+                =table_header_tag :running, priority: 5
+                =table_header_tag :alive, priority: 5
+                =table_header_tag :last_check_in, priority: 4
+                =table_header_tag :runs, priority: 4
+                =table_header_actions_tag
+            %tbody
+              - @workers.each do |worker|
+                %tr
+                  %td=worker.host_name
+                  %td=worker.pid
+                  %td=materialize_icon(worker.running? ? 'directions_run' : 'pending')
+                  %td=materialize_icon(worker.dead? ? 'do_disturb' : 'run_circle')
+                  %td=current_user.local_time(worker.last_check_in_at)
+                  %td=worker.runs.count
+                  %td.actions
+                    = delete_link_tag(worker, model_path(worker))

data/app/views/delayed_job_workers/index.html.haml

@@ -0,0 +1 @@
+=render 'index'

data/app/views/delayed_jobs/_index.html.haml

@@ -1,54 +1,49 @@
 - title t('.title')
-- if can?(:manage, Delayed::Backend::Mongoid::Job)
-  .fixed-action-btn.horizontal
-    %a.btn-floating.btn-large{style: 'padding: 0;margin: 15px 15px' }
-      %i.material-icons replay
-    %ul
-      %li
-        %a.btn-floating.yellow{href: class_action_path(:destroy_all, failed_only:true),
-          title: t('.destroy_all'),
-          data: {confirm: t('.confirm_destroy_all')}}
-          %i.material-icons
-            delete
-      %li
-        %a.btn-floating.red{href: class_action_path(:destroy_all, failed_only:false),
-          title: t('.destroy_all'),
-          data: {confirm: t('.confirm_destroy_all')}}
-          %i.material-icons
-            delete
-      %li
-        %a.btn-floating.yellow.darken-3{href: class_action_path(:resbumit_all, failed_only:true),
-          title: t('.resubmit_failed'),
-          data: {confirm: t('.confirm_resubmit_failed')}}
-          %i.material-icons
-            restore
-      %li
-        %a.btn-floating.red{href: class_action_path(:resbumit_all, failed_only:false),
-          title: t('.resubmit_all'),
-          data: {confirm: t('.confirm_resubmit_all')}}
-          %i.material-icons
-            restore
-- if @delayed_jobs.blank?
-  %h2.center-align.grey-text=t('.no_data_found')
-- else
-  .container
-    .row
-      .col.s12
-        %table.highlight.bordered.extended{data: {sort: {column: 'Run At,Priority', direction: 'desc,asc'}}}
-          %thead
-            %tr
-              %th=t('.run_at')
-              %th=t('.name')
-              %th=t('.priority')
-              %th=t('.status')
-              %th=t('.actions')
-          %tbody
-            - @delayed_jobs.each do |delayed_job|
+.container
+  .row
+    .s12
+      .card
+        .card-content
+          .card-title Delayed Jobs
+          - if can?(:manage, Delayed::Backend::Mongoid::Job)
+            .card-tray
+              %a.btn.yellow{href: class_action_path(:destroy_all, failed_only:true),
+                title: t('.destroy_all'),
+                data: {confirm: t('.confirm_destroy_failed')}}
+                %i.material-icons
+                  delete
+              %a.btn.red{href: class_action_path(:destroy_all, failed_only:false),
+                title: t('.destroy_all'),
+                data: {confirm: t('confirm_destroy_all')}}
+                %i.material-icons
+                  delete
+              %a.btn.yellow.darken-3{href: class_action_path(:resbumit_all, failed_only:true),
+                title: t('.resubmit_failed'),
+                data: {confirm: t('.confirm_resubmit_failed')}}
+                %i.material-icons
+                  restore
+              %a.btn.red{href: class_action_path(:resbumit_all, failed_only:false),
+                title: t('.resubmit_all'),
+                data: {confirm: t('.confirm_resubmit_all')}}
+                %i.material-icons
+                  restore
+      .card
+        .card-content
+          %table.highlight.data-table
+            %thead
               %tr
-                %td=current_user.local_time(delayed_job.created_at)
-                %td.name=link_to(delayed_job.display_name, model_path(delayed_job))
-                %td=delayed_job.priority
-                %td=delayed_job.status_description
-                %td.actions
-                  = replay_link_tag(delayed_job, model_action_path(delayed_job, :resubmit), confirm: 'Are you sure you want to restart this job?')
-                  = delete_link_tag(delayed_job, model_path(delayed_job))
+                =table_header_tag :run_at, priority: 3
+                =table_header_tag :name
+                =table_header_tag :priority, priority: 5
+                =table_header_tag :status, priority: 4
+                =table_header_actions_tag
+            %tbody
+              - @delayed_jobs.each do |delayed_job|
+                %tr
+                  %td=current_user.local_time(delayed_job.created_at)
+                  %td.name=link_to(delayed_job.display_name, model_path(delayed_job))
+                  %td=delayed_job.priority
+                  %td=delayed_job.status_description
+                  %td.actions
+                    = replay_link_tag(delayed_job, model_action_path(delayed_job, :resubmit), confirm: 'Are you sure you want to restart this job?')
+                    = delete_link_tag(delayed_job, model_path(delayed_job))

data/app/views/delayed_jobs/_show.html.haml

@@ -1,12 +1,16 @@
-- title t('.title')
-- content_for :breadcrumbs do
-  %a.breadcrumb{href: index_path}=t('delayed_jobs.index.title')
-  %a.breadcrumb{href: '#'}=t('.title')
+- title @delayed_job.name
 .container
   .row
     .col.s12
-      .mod
-        .mod-body.no-padding
+      .card
+        .card-content
+          .card-title= @delayed_job.name
+          - if can?(:manage, @delayed_job)
+            .card-tray
+              =delete_button_tag(@delayed_job, model_path(@delayed_job))
+              =replay_button_tag(@delayed_job, model_path(@delayed_job))
+      .card
+        .card-content
           %table#info{class: 'bordered'}
             %tr
               %th=t('.name_label')
@@ -49,10 +53,8 @@
               %tr
                 %th=t('delayed_jobs.show.last_error_label')
                 %td=@delayed_job.last_error
-
-  - if can? :manage, @delayed_job
-    .row
-      .col.s6.center-align
-        = link_to "Delete", model_path(@delayed_job), class: 'button delete', method: :delete, data: {confirm: "Are you sure you want to delete this job?"}
-      .col.s6.center-align
-        = link_to "Resubmit", model_action_path(@delayed_job, :resubmit), class: 'button action', data: {confirm: 'Are you sure you want to resubmit this job?'}
+        - if can? :manage, @delayed_job
+          .card-action
+            .row
+              .col.s6.center-align= delete_button_tag(@delayed_job, model_path(@delayed_job))
+              .col.s6.center-align= replay_button_tag(@delayed_job, model_path(@delayed_job))

data/app/views/system_configurations/_edit.html.haml

@@ -1,10 +1,15 @@
-- title t('.title', name: SystemConfiguration.environment.titleize)
-.container
-  %form{action: index_path, method: :post}
-    %input{type: :hidden, value: form_authenticity_token, name: 'authenticity_token'}
-    %input{type: :hidden, name: '_method', value: 'put'}
+- title SystemConfiguration.environment.titleize
+%form{action: index_path, method: :post}
+  %input{type: :hidden, value: form_authenticity_token, name: :authenticity_token}
+  %input{type: :hidden, name: '_method', value: :put}
+  .container
     .row
-      = form_text_field(@system_configuration, :switchboard_base_url, classes: %w[s12 m4])
-      = form_text_field(@system_configuration, :switchboard_stack_id, classes: %w[s12 m4])
-      = form_password(@system_configuration, :switchboard_stack_api_token, classes: %w[s12 m4])
-    = render '/common/form_actions', form_cancel_path: index_path
+      .col.s12
+        .card
+          .card-content
+            .card-title= SystemConfiguration.environment.titleize
+            .row
+              = form_text_field(@system_configuration, :switchboard_base_url, classes: %w[s12 m4])
+              = form_text_field(@system_configuration, :switchboard_stack_id, classes: %w[s12 m4])
+              = form_password(@system_configuration, :switchboard_stack_api_token, classes: %w[s12 m4])
+          = render 'common/update_actions', form_cancel_path: index_path

data/app/views/system_configurations/_show.html.haml

@@ -1,15 +1,21 @@
-- title t('.title', name: SystemConfiguration.environment.titleize)
-= edit_class_link_tag(SystemConfiguration, class_action_path(:edit))
+- title SystemConfiguration.environment.titleize
 .container
   .row
     .s12
-      %table.highlight.striped.extended
-        %thead
-          %tr
-            %th.center-align=t('.field_header')
-            %th.center-align=t('.value_header')
-        %tbody
-          - SystemConfiguration.allowed_param_names.sort.each do |field|
-            %tr
-              %td.right-align=field.titleize
-              %td.left-align=mask_system_configuration(field)
+      .card
+        .card-content
+          .card-title=SystemConfiguration.environment.titleize
+          .card-tray
+            = edit_link_tag(SystemConfiguration, class_action_path(:edit))
+      .card
+        .card-content.section-data-tables
+          %table.highlight.striped.data-table
+            %thead
+              %tr
+                =table_header_tag :field
+                =table_header_tag :value
+            %tbody
+              - SystemConfiguration.allowed_param_names.each do |field|
+                %tr
+                  %td=field
+                  %td=mask_system_configuration(field)

data/config/brakeman.ignore

@@ -0,0 +1,26 @@
+{
+  "ignored_warnings": [
+    {
+      "warning_type": "Command Injection",
+      "warning_code": 14,
+      "fingerprint": "4cde947f1dccdd96581d38647925be10f74835464af7e8790dc776c9160a0453",
+      "check_name": "Execute",
+      "message": "Possible command injection",
+      "file": "lib/app/models/command_job.rb",
+      "line": 316,
+      "link": "https://brakemanscanner.org/docs/warning_types/command_injection/",
+      "code": "`#{command.join(\" \")} > #{Tempfile.new.path} 2>&1`",
+      "render_path": null,
+      "location": {
+        "type": "method",
+        "class": "CommandJob",
+        "method": "run_command"
+      },
+      "user_input": "command.join(\" \")",
+      "confidence": "Medium",
+      "note": "This is the purpose of the method, to run any command, accepted risk by Chris Schroeder"
+    }
+  ],
+  "updated": "2021-03-05 09:25:43 -0500",
+  "brakeman_version": "5.0.0"
+}

data/config/brakeman.yml

@@ -0,0 +1,2 @@
+---
+:ignore_file: config/brakeman.ignore

data/config/locales/en.yml

@@ -32,6 +32,7 @@ en:
       delete: Delete
       info: View
       replay: Restart
+      favorite: Favorite
     system_configuration:
       placeholders:
         switchboard_base_url: https://switchboard.app47.com
@@ -67,10 +68,14 @@ en:
       wday: Week Day
       enabled: Enabled?
       actions: Actions
-      host: Host
-      state: State
       last_run_at: Last Run At
       confirm: Are you sure you want to run %{name}?
+  delayed_job_workers:
+    index:
+      title: Delayed Job Workers
+  delayed_job_metrics:
+    index:
+      title: Delayed Job Metrics
   delayed_jobs:
     index:
       title: "Delayed Jobs"
@@ -101,4 +106,17 @@ en:
       locked_by_label: "Locked by"
       handler_label: "Handler"
       failed_at_label: "Failed at"
-      last_error_label: "Last Error"
+      last_error_label: "Last Error"
+  core_table:
+    headers:
+      host: Host
+      state: State
+      last_check_in_at: Last Check In
+      run_at: Run At
+      last_run_at: Last Run
+      name: Name
+      priority: Priority
+      status: Status
+      pid: PID
+      running: Running?
+      alive: Alive?

data/lib/app/controllers/concerns/core_delayed_job_metrics_controller.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+#
+# Manage access to delayed job workers
+#
+module CoreDelayedJobMetricsController
+  include CoreController
+  #
+  # Show a list of workers currently in the system
+  #
+  def index
+    authorize! :read, Delayed::Jobs::Metric
+    @metrics = Delayed::Jobs::Metric.all
+  end
+
+  #
+  # Destroy the selected delayed job worker
+  #
+  def destroy
+    authorize! :manage, delayed_job_metric
+    delayed_job_metric.destroy!
+    flash.now[:info] = 'Delayed Job Metric has been destroyed'
+    redirect_to index_path
+  rescue StandardError => error
+    log_controller_error error, true
+    redirect_to index_path
+  end
+
+  #
+  # Fetch the required job by id
+  #
+  def delayed_job_metric
+    @delayed_job_metric ||= Delayed::Jobs::Metric.find(params[:id])
+  end
+end

data/lib/app/controllers/concerns/core_delayed_job_workers_controller.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+#
+# Manage access to delayed job workers
+#
+module CoreDelayedJobWorkersController
+  include CoreController
+  #
+  # Show a list of workers currently in the system
+  #
+  def index
+    authorize! :read, Delayed::Jobs::Worker
+    @workers = Delayed::Jobs::Worker.all
+  end
+
+  #
+  # Destroy the selected delayed job worker
+  #
+  def destroy
+    authorize! :manage, delayed_job_worker
+    delayed_job_worker.destroy!
+    flash.now[:info] = 'Delayed Job Worker has been destroyed'
+    redirect_to index_path
+  rescue StandardError => error
+    log_controller_error error, true
+    redirect_to index_path
+  end
+
+  #
+  # Fetch the required job by id
+  #
+  def delayed_job_worker
+    @delayed_job_worker ||= Delayed::Jobs::Worker.find(params[:id])
+  end
+end

data/lib/app/controllers/concerns/core_delayed_jobs_controller.rb

@@ -90,9 +90,8 @@ module CoreDelayedJobsController
   # Find the first jobs for index or deleting all
   #
   def delayed_jobs
-    @delayed_jobs ||= Delayed::Backend::Mongoid::Job
-                        .order_by(locked_by: :desc, priority: :asc, run_at: :asc)
-                        .limit(delayed_jobs_limit)
+    @delayed_jobs ||= Delayed::Backend::Mongoid::Job.order_by(locked_by: :desc, priority: :asc, run_at: :asc)
+                                                    .limit(delayed_jobs_limit)
   end
 
   #

data/lib/app/jobs/application_job.rb

@@ -13,7 +13,6 @@ class ApplicationJob < ActiveJob::Base
   # Standard approach to running jobs
   #
   def perform(payload = {})
-    Rails.cache.reconnect
     @started_at = Time.now.utc
     @payload = payload
     parse_payload

data/lib/app/jobs/cron/command.rb

@@ -27,9 +27,6 @@ module Cron
           warn opt
           exit 1
         end
-        opt.on('-e', '--environment=NAME', 'Specifies the environment to run this delayed jobs under (test/development/production).') do
-          warn 'The -e/--environment option has been deprecated and has no effect. Use RAILS_ENV and see http://github.com/collectiveidea/delayed_job/issues/7'
-        end
         opt.on('--pid-dir=DIR', 'Specifies an alternate directory in which to store the process ids.') do |dir|
           @options[:pid_dir] = dir
         end
@@ -39,7 +36,7 @@ module Cron
         opt.on('-m', '--monitor', 'Start monitor process.') do
           @options[:monitor] = true
         end
-        opt.on('--exit-on-complete', 'Exit when no more jobs are available to run. This will exit if all jobs are scheduled to run in the future.') do
+        opt.on('--exit-on-complete', 'Exit when no more jobs are available to run.') do
           @options[:exit_on_complete] = true
         end
         opt.on('--daemon-options a, b, c', Array, 'options to be passed through to daemons gem') do |daemon_options|

data/lib/app/jobs/cron/record_delayed_job_metrics.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Cron
+  #
+  # Take care of job metrics
+  #
+  class RecordDelayedJobMetrics < Job
+    cron_tab_entry :daily
+
+    #
+    # Main driver method
+    #
+    def execute
+      Delayed::Jobs::Run.each do |run|
+        metric = Delayed::Jobs::Metric.find_or_create_by! name: run.name
+        metric.set count: metric.count + 1,
+                   total: run.duration + metric.total,
+                   max: [metric.max, run.duration].max,
+                   min: [metric.min, run.duration].min,
+                   last_run_at: [run.locked_at, metric.last_run_at].compact.max
+        run.destroy!
+      end
+    end
+  end
+end