rocketjob_mission_control 4.3.0 → 6.0.0.beta

data/app/controllers/rocket_job_mission_control/servers_controller.rb

@@ -12,56 +12,59 @@ module RocketJobMissionControl
 
     rescue_from AccessGranted::AccessDenied do |exception|
       raise exception if Rails.env.development? || Rails.env.test?
-      redirect_to :back, alert: 'Access not authorized.'
+
+      redirect_to :back, alert: "Access not authorized."
     end
 
     def index
-      @data_table_url = servers_url(format: 'json')
-      @actions        = [:pause, :resume, :stop, :kill, :destroy_zombies]
-      render_datatable(RocketJob::Server.all, 'All')
+      @data_table_url = servers_url(format: "json")
+      @actions        = %i[pause resume stop kill destroy_zombies]
+      render_datatable(RocketJob::Server.all, "All")
     end
 
     def starting
-      @data_table_url = starting_servers_url(format: 'json')
-      @actions        = [:pause, :stop, :kill]
-      render_datatable(RocketJob::Server.starting, 'Starting')
+      @data_table_url = starting_servers_url(format: "json")
+      @actions        = %i[pause stop kill]
+      render_datatable(RocketJob::Server.starting, "Starting")
     end
 
     def running
-      @data_table_url = running_servers_url(format: 'json')
-      @actions        = [:pause, :stop, :kill, :destroy_zombies]
-      render_datatable(RocketJob::Server.running, 'Running')
+      @data_table_url = running_servers_url(format: "json")
+      @actions        = %i[pause stop kill destroy_zombies]
+      render_datatable(RocketJob::Server.running, "Running")
     end
 
     def paused
-      @data_table_url = paused_servers_url(format: 'json')
-      @actions        = [:resume, :destroy_zombies]
-      render_datatable(RocketJob::Server.paused, 'Paused')
+      @data_table_url = paused_servers_url(format: "json")
+      @actions        = %i[resume destroy_zombies]
+      render_datatable(RocketJob::Server.paused, "Paused")
     end
 
     def stopping
-      @data_table_url = stopping_servers_url(format: 'json')
+      @data_table_url = stopping_servers_url(format: "json")
       @actions        = [:destroy_zombies]
-      render_datatable(RocketJob::Server.stopping, 'Stopping')
+      render_datatable(RocketJob::Server.stopping, "Stopping")
     end
 
     def zombie
-      @data_table_url = zombie_servers_url(format: 'json')
+      @data_table_url = zombie_servers_url(format: "json")
       @actions        = [:destroy_zombies]
-      render_datatable(RocketJob::Server.zombies, 'Zombie')
+      render_datatable(RocketJob::Server.zombies, "Zombie")
     end
 
-    VALID_ACTIONS = [:stop, :kill, :pause, :resume, :thread_dump]
+    VALID_ACTIONS = %i[stop kill pause resume thread_dump].freeze
 
     def update_all
-      authorize! :update_all, RocketJob::Server
       server_action = params[:server_action].to_sym
+      authorize! server_action, RocketJob::Server
+
       if server_action == :destroy_zombies
         RocketJob::Server.destroy_zombies
       elsif VALID_ACTIONS.include?(server_action)
         RocketJob::Subscribers::Server.publish(server_action)
+        flash[:notice] = t(:success, scope: %i[server update_all], action: server_action.to_s)
       else
-        flash[:alert] = t(:invalid, scope: [:server, :update_all])
+        flash[:alert] = t(:invalid, scope: %i[server update_all])
       end
 
       # TODO: Refresh the same page it was on
@@ -72,11 +75,8 @@ module RocketJobMissionControl
 
     def stop
       authorize! :stop, @server
-      if @server.may_stop?
-        @server.stop!
-      else
-        flash[:alert] = t(:failure, scope: [:server, :stop])
-      end
+      RocketJob::Subscribers::Server.publish(:stop, server_id: @server.id)
+      flash[:notice] = t(:success, scope: %i[server update_one], action: "stop", name: @server.name)
 
       respond_to do |format|
         format.html { redirect_to servers_path }
@@ -86,7 +86,7 @@ module RocketJobMissionControl
     def destroy
       authorize! :destroy, @server
       @server.destroy
-      flash[:notice] = t(:success, scope: [:server, :destroy])
+      flash[:notice] = t(:success, scope: %i[server destroy])
 
       respond_to do |format|
         format.html { redirect_to servers_path }
@@ -95,11 +95,8 @@ module RocketJobMissionControl
 
     def pause
       authorize! :pause, @server
-      if @server.may_pause?
-        @server.pause!
-      else
-        flash[:alert] = t(:failure, scope: [:server, :pause])
-      end
+      RocketJob::Subscribers::Server.publish(:pause, server_id: @server.id)
+      flash[:notice] = t(:success, scope: %i[server update_one], action: "pause", name: @server.name)
 
       respond_to do |format|
         format.html { redirect_to servers_path }
@@ -108,11 +105,8 @@ module RocketJobMissionControl
 
     def resume
       authorize! :resume, @server
-      if @server.may_resume?
-        @server.resume!
-      else
-        flash[:alert] = t(:failure, scope: [:server, :resume])
-      end
+      RocketJob::Subscribers::Server.publish(:resume, server_id: @server.id)
+      flash[:notice] = t(:success, scope: %i[server update_one], action: "resume", name: @server.name)
 
       respond_to do |format|
         format.html { redirect_to servers_path }
@@ -130,7 +124,7 @@ module RocketJobMissionControl
         format.html do
           @description = description
           @states      = RocketJob::Server.aasm.states.map { |s| s.name.to_s }
-          @states << 'zombie'
+          @states << "zombie"
 
           @server_counts          = RocketJob::Server.counts_by_state
           # TODO: Move into RocketJob
@@ -146,7 +140,7 @@ module RocketJobMissionControl
 
     def find_server_or_redirect
       unless @server = RocketJob::Server.where(id: params[:id]).first
-        flash[:alert] = t(:failure, scope: [:server, :find], id: params[:id])
+        flash[:alert] = t(:failure, scope: %i[server find], id: params[:id])
 
         redirect_to(servers_path)
       end

data/app/datatables/rocket_job_mission_control/abstract_datatable.rb

@@ -1,7 +1,7 @@
 module RocketJobMissionControl
   class AbstractDatatable
     delegate :params, :link_to, :render, to: :@view
-    delegate :h, to: 'ERB::Util'
+    delegate :h, to: "ERB::Util"
 
     attr_accessor :view, :query
 
@@ -11,7 +11,7 @@ module RocketJobMissionControl
       extract_query_params
     end
 
-    def as_json(options = {})
+    def as_json(_options = {})
       {
         draw:            params[:draw].to_i,
         recordsTotal:    query.unfiltered_count,
@@ -39,7 +39,7 @@ module RocketJobMissionControl
       end
 
       # Pagination
-      unless params[:length].present? && params[:length] == '-1'
+      unless params[:length].present? && params[:length] == "-1"
         query.start     = params[:start].to_i
         query.page_size = params.fetch(:length, 10).to_i
       end
@@ -49,13 +49,15 @@ module RocketJobMissionControl
       return nil unless order.present?
 
       sort_by = {}
-      order.each_pair do |key, value|
+      order.each_pair do |_key, value|
         name = query.display_columns[value[:column].to_i]
-        raise(ArgumentError, "Invalid column id: #{value[:column]}. Must fit #{query.display_columns.inspect}") unless name.present?
+        unless name.present?
+          raise(ArgumentError, "Invalid column id: #{value[:column]}. Must fit #{query.display_columns.inspect}")
+        end
+
         sort_by[name] = value[:dir]
       end
       sort_by
     end
-
   end
 end

data/app/datatables/rocket_job_mission_control/active_workers_datatable.rb

@@ -10,11 +10,11 @@ module RocketJobMissionControl
 
     def map(active_worker)
       {
-        '0'           => worker_name_with_icon(active_worker, active_worker.job),
-        '1'           => job_name_with_link(active_worker.job.class.name, active_worker.job.id),
-        '2'           => h(active_worker.job.description.try!(:truncate, 50)),
-        '3'           => h("#{active_worker.duration} ago"),
-        'DT_RowClass' => 'card callout callout-running'
+        "0"           => worker_name_with_icon(active_worker, active_worker.job),
+        "1"           => job_name_with_link(active_worker.job.class.name, active_worker.job.id),
+        "2"           => h(active_worker.job.description.try!(:truncate, 50)),
+        "3"           => h("#{active_worker.duration} ago"),
+        "DT_RowClass" => "card callout callout-running"
       }
     end
 

data/app/datatables/rocket_job_mission_control/dirmon_entries_datatable.rb

@@ -6,10 +6,10 @@ module RocketJobMissionControl
 
     def map(dirmon)
       {
-        '0'           => name_with_link(dirmon),
-        '1'           => h(dirmon.job_class_name),
-        '2'           => h(dirmon.pattern.try(:truncate, 80)),
-        'DT_RowClass' => "card callout callout-#{dirmon.state}"
+        "0"           => name_with_link(dirmon),
+        "1"           => h(dirmon.job_class_name),
+        "2"           => h(dirmon.pattern.try(:truncate, 80)),
+        "DT_RowClass" => "card callout callout-#{dirmon.state}"
       }
     end
 

data/app/datatables/rocket_job_mission_control/jobs_datatable.rb

@@ -4,68 +4,68 @@ module RocketJobMissionControl
              :abort_job_path, :job_path, :fail_job_path, :run_now_job_path, :pause_job_path,
              :resume_job_path, :retry_job_path, :exception_job_path, :job_action_link, :exceptions_job_path, to: :@view
 
-    COMMON_FIELDS = [:id, :_type, :description, :completed_at, :created_at, :started_at, :state, :worker_name, :login].freeze
+    COMMON_FIELDS = %i[id _type description completed_at created_at started_at state worker_name login].freeze
 
     ABORTED_COLUMNS = [
-      {display: 'Class', value: :class_with_link, field: '_type', width: '30%'},
-      {display: 'Description', value: :description, field: 'description', width: '30%'},
-      {display: 'Aborted', value: :completed_ago, field: 'completed_at'},
-      {display: 'Actions', value: :action_buttons, orderable: false}
-    ]
+      {display: "Class", value: :class_with_link, field: "_type", width: "30%"},
+      {display: "Description", value: :description, field: "description", width: "30%"},
+      {display: "Aborted", value: :completed_ago, field: "completed_at"},
+      {display: "Actions", value: :action_buttons, orderable: false}
+    ].freeze
 
     COMPLETED_COLUMNS = [
-      {display: 'Class', value: :class_with_link, field: '_type', width: '30%'},
-      {display: 'Description', value: :description, field: 'description', width: '30%'},
-      {display: 'Duration', value: :duration, field: 'duration', orderable: false},
-      {display: 'Completed', value: :completed_ago, field: 'completed_at'},
-      {display: 'Actions', value: :action_buttons, orderable: false}
-    ]
+      {display: "Class", value: :class_with_link, field: "_type", width: "30%"},
+      {display: "Description", value: :description, field: "description", width: "30%"},
+      {display: "Duration", value: :duration, field: "duration", orderable: false},
+      {display: "Completed", value: :completed_ago, field: "completed_at"},
+      {display: "Actions", value: :action_buttons, orderable: false}
+    ].freeze
 
     FAILED_COLUMNS              = ABORTED_COLUMNS.deep_dup
-    FAILED_COLUMNS[2][:display] = 'Failed'
+    FAILED_COLUMNS[2][:display] = "Failed"
 
     PAUSED_COLUMNS              = ABORTED_COLUMNS.deep_dup
-    PAUSED_COLUMNS[2][:display] = 'Paused'
+    PAUSED_COLUMNS[2][:display] = "Paused"
 
     QUEUED_COLUMNS = [
-      {display: 'Class', value: :class_with_link, field: '_type'},
-      {display: 'Description', value: :description, field: 'description'},
-      {display: 'Record Count', value: :record_count, field: 'record_count'},
-      {display: 'Priority', value: :priority, field: 'priority'},
-      {display: 'Queued For', value: :duration, field: 'duration', orderable: false},
-      {display: 'Actions', value: :action_buttons, orderable: false}
-    ]
-    QUEUED_FIELDS  = (COMMON_FIELDS + [:record_count, :run_at, :priority]).freeze
+      {display: "Class", value: :class_with_link, field: "_type"},
+      {display: "Description", value: :description, field: "description"},
+      {display: "Record Count", value: :record_count, field: "record_count"},
+      {display: "Priority", value: :priority, field: "priority"},
+      {display: "Queued For", value: :duration, field: "duration", orderable: false},
+      {display: "Actions", value: :action_buttons, orderable: false}
+    ].freeze
+    QUEUED_FIELDS = (COMMON_FIELDS + %i[record_count run_at priority]).freeze
 
     RUNNING_COLUMNS = [
-      {display: 'Class', value: :class_with_link, field: '_type'},
-      {display: 'Description', value: :description, field: 'description'},
-      {display: 'Record Count', value: :record_count, field: 'record_count'},
-      {display: 'Progress', value: :progress, field: 'percent_complete', orderable: false},
-      {display: 'Workers', value: :worker_count, field: 'worker_count', orderable: false},
-      {display: 'Priority', value: :priority, field: 'priority'},
-      {display: 'Started', value: :started, field: 'started_at'},
-      {display: 'Actions', value: :action_buttons, orderable: false}
-    ]
-    RUNNING_FIELDS  = (COMMON_FIELDS + [:record_count, :collect_output, :input_categories, :output_categories, :encrypt, :compress, :slice_size, :priority, :sub_state, :percent_complete]).freeze
+      {display: "Class", value: :class_with_link, field: "_type"},
+      {display: "Description", value: :description, field: "description"},
+      {display: "Record Count", value: :record_count, field: "record_count"},
+      {display: "Progress", value: :progress, field: "percent_complete", orderable: false},
+      {display: "Workers", value: :worker_count, field: "worker_count", orderable: false},
+      {display: "Priority", value: :priority, field: "priority"},
+      {display: "Started", value: :started, field: "started_at"},
+      {display: "Actions", value: :action_buttons, orderable: false}
+    ].freeze
+    RUNNING_FIELDS = (COMMON_FIELDS + %i[record_count input_categories output_categories priority sub_state percent_complete]).freeze
 
     SCHEDULED_COLUMNS = [
-      {display: 'Class', value: :class_with_link, field: '_type'},
-      {display: 'Description', value: :description, field: 'description'},
-      {display: 'Runs in', value: :time_till_run, field: 'run_at'},
-      {display: 'Cron Schedule', value: :cron_schedule, field: 'cron_schedule'},
-      {display: 'Actions', value: :action_buttons, orderable: false}
-    ]
-    SCHEDULED_FIELDS  = (COMMON_FIELDS + [:run_at, :cron_schedule]).freeze
+      {display: "Class", value: :class_with_link, field: "_type"},
+      {display: "Description", value: :description, field: "description"},
+      {display: "Runs in", value: :time_till_run, field: "run_at"},
+      {display: "Cron Schedule", value: :cron_schedule, field: "cron_schedule"},
+      {display: "Actions", value: :action_buttons, orderable: false}
+    ].freeze
+    SCHEDULED_FIELDS = (COMMON_FIELDS + %i[run_at cron_schedule]).freeze
 
     ALL_COLUMNS = [
-      {display: 'Class', value: :class_with_link, field: '_type'},
-      {display: 'Description', value: :description, field: 'description'},
-      {display: 'Created', value: :created_at, field: 'created_at'},
-      {display: 'Duration', value: :duration, field: 'duration', orderable: false},
-      {display: 'Actions', value: :action_buttons, orderable: false}
-    ]
-    ALL_FIELDS  = (QUEUED_FIELDS + RUNNING_FIELDS + SCHEDULED_FIELDS).uniq.freeze
+      {display: "Class", value: :class_with_link, field: "_type"},
+      {display: "Description", value: :description, field: "description"},
+      {display: "Created", value: :created_at, field: "created_at"},
+      {display: "Duration", value: :duration, field: "duration", orderable: false},
+      {display: "Actions", value: :action_buttons, orderable: false}
+    ].freeze
+    ALL_FIELDS = (QUEUED_FIELDS + RUNNING_FIELDS + SCHEDULED_FIELDS).uniq.freeze
 
     def initialize(view, query, columns)
       @columns = columns
@@ -84,9 +84,9 @@ module RocketJobMissionControl
       h     = {}
       @columns.each do |column|
         h[index.to_s] = send(column[:value], job)
-        index         += 1
+        index += 1
       end
-      h['DT_RowClass'] = "card callout callout-#{job_state(job)}"
+      h["DT_RowClass"] = "card callout callout-#{job_state(job)}"
       h
     end
 
@@ -121,7 +121,7 @@ module RocketJobMissionControl
     end
 
     def record_count(job)
-      job.attributes.key?('record_count') ? h(job.record_count) : 0
+      job.attributes.key?("record_count") ? h(job.record_count) : 0
     end
 
     def started(job)
@@ -141,7 +141,7 @@ module RocketJobMissionControl
     end
 
     def progress(job)
-      if (sub_state = job.attributes['sub_state']) && [:before, :after].include?(sub_state)
+      if (sub_state = job.attributes["sub_state"]) && %i[before after].include?(sub_state)
         <<-EOS
           <div class="job-status">
             <div class="job-state">
@@ -162,27 +162,20 @@ module RocketJobMissionControl
     def action_buttons(job)
       events  = valid_events(job)
       buttons = "<div class='inline-job-actions'>"
-      if job.scheduled? && view.can?(:run_now, job)
-        buttons += "#{ job_action_link('Run', run_now_job_path(job), :patch) }"
-      end
+      buttons += job_action_link("Run", run_now_job_path(job), :patch).to_s if job.scheduled? && view.can?(:run_now, job)
       if events.include?(:pause) && job.pausable? && view.can?(:pause, job)
-        buttons += "#{ job_action_link('Pause', pause_job_path(job), :patch) }"
+        buttons += job_action_link("Pause", pause_job_path(job), :patch).to_s
       end
       if events.include?(:resume) && view.can?(:resume, job)
-        buttons += "#{ job_action_link('Resume', resume_job_path(job), :patch) }"
-      end
-      if events.include?(:retry) && view.can?(:retry, job)
-        buttons += "#{ job_action_link('Retry', retry_job_path(job), :patch) }"
-      end
-      if view.can?(:destroy, job)
-        buttons += "#{ job_action_link('Destroy', job_path(job), :delete) }"
+        buttons += job_action_link("Resume", resume_job_path(job), :patch).to_s
       end
+      buttons += job_action_link("Retry", retry_job_path(job), :patch).to_s if events.include?(:retry) && view.can?(:retry, job)
+      buttons += job_action_link("Destroy", job_path(job), :delete).to_s if view.can?(:destroy, job)
       buttons += "</div>"
     end
 
     def valid_events(job)
       job.aasm.events.collect(&:name)
     end
-
   end
 end

data/app/datatables/rocket_job_mission_control/servers_datatable.rb

@@ -12,12 +12,12 @@ module RocketJobMissionControl
 
     def map(server)
       {
-        '0'           => name_with_icon(server),
-        '1'           => h(threads(server)),
-        '2'           => h(started_ago(server)),
-        '3'           => h(time_since_heartbeat(server)),
-        '4'           => action_links_html(server),
-        'DT_RowClass' => "card callout #{server_card_class(server)}"
+        "0"           => name_with_icon(server),
+        "1"           => h(threads(server)),
+        "2"           => h(started_ago(server)),
+        "3"           => h(time_since_heartbeat(server)),
+        "4"           => action_links_html(server),
+        "DT_RowClass" => "card callout #{server_card_class(server)}"
       }
     end
 
@@ -45,33 +45,32 @@ module RocketJobMissionControl
       events  = valid_events(server)
 
       if events.include?(:resume) && view.can?(:resume, server)
-        actions += "#{ link_to "resume", resume_server_path(server), method: :patch, class: 'btn btn-default', data: {confirm: "Resume this server?"}  }"
+        actions += (link_to "resume", resume_server_path(server), method: :patch, class: "btn btn-default", data: {confirm: "Resume this server?"}).to_s
       end
 
       if events.include?(:pause) && view.can?(:pause, server)
-        actions += "#{ link_to "pause", pause_server_path(server), method: :patch, class: 'btn btn-default', data: {confirm: "Pause this server?"} }"
+        actions += (link_to "pause", pause_server_path(server), method: :patch, class: "btn btn-default", data: {confirm: "Pause this server?"}).to_s
       end
 
       if events.include?(:stop) && view.can?(:stop, server)
-        actions += "#{ link_to "stop", stop_server_path(server), method: :patch, class: 'btn btn-danger', data: {confirm: "Stop this server?"} }"
+        actions += (link_to "stop", stop_server_path(server), method: :patch, class: "btn btn-danger", data: {confirm: "Stop this server?"}).to_s
       end
 
       if server.stopping? && view.can?(:destroy, server)
-        actions      += "Server is stopping..."
-        confirmation = ''
+        actions += "Server is stopping..."
+        confirmation = ""
         unless server.zombie?
           confirmation << "Warning!\n\nDestroying this server will hard kill its active workers/jobs.\nKilled jobs will be requeued for processing on another worker.\n\n"
         end
         confirmation << "Are you sure you want to destroy #{server.name} ?"
-        actions += "#{ link_to "destroy", server_path(server), method: :delete, class: 'btn btn-danger', data: {confirm: confirmation}  }"
+        actions += (link_to "destroy", server_path(server), method: :delete, class: "btn btn-danger", data: {confirm: confirmation}).to_s
       end
 
-      actions += '</div>'
+      actions += "</div>"
     end
 
     def valid_events(server)
       server.aasm.events.collect(&:name)
     end
-
   end
 end