rocketjob_mission_control 2.1.1 → 3.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7962e3b8e27b8b98e946fedd53bfba833a92769f
-  data.tar.gz: 6bf9aa56d4c51a47c459b0f13c33c604161f3b1a
+  metadata.gz: 70e693d49e4ca57ddb518fbd75c3b66facbe134d
+  data.tar.gz: f2d480f5f2f19fdb8106f5d258173b05b66e6d11
 SHA512:
-  metadata.gz: fba1711a8c000adf050fe6dbf840c7aaa70ae189276696bc41edc615280572f7019242633d6b46d99d8e6a95f4c01ebc483b717bf793cac4bde91166ac49f405
-  data.tar.gz: a1f334a2c43f79a67b0b3b98c417957518ac862107b02287c129577fbb31173195ece72303fb78e8678e56b6f468d82ad0c624a7e6a6b8159a6a5796e0753f52
+  metadata.gz: 6e040ed3c8d00608471dc4c55e07b4b28f17731ed07ab2c6309663993f91323e8f348816d4b2de37e9f9290ccc5c3bec7eda905227a76ac29bff082e4fc6abd4
+  data.tar.gz: f6871621fb675475d9733cd181c108a6d7ad3877b65a8a47128f68ef5b8eaaedb26859df81a511c4fb37a4487a4ca465339f5bb044b903736e95e84fa79d5367

data/README.md

@@ -24,10 +24,10 @@ Job Management
 * Abort, or fail queued or running jobs
 * Destroy a completed or aborted job
 
-Worker Management
+Server Management
 
-* View running workers
-* Stop workers
+* View running servers
+* Stop servers
 
 Running Jobs
 

data/app/assets/stylesheets/rocket_job_mission_control/callout.scss

@@ -60,7 +60,7 @@
   }
 }
 
-/* Used by Workers */
+/* Used by Servers */
 .callout-top {
   border: 1px solid #eee;
   border-left-width: 5px;

data/app/assets/stylesheets/rocket_job_mission_control/worker_processes.scss

@@ -1,5 +1,5 @@
-#workers {
-  .worker-collection-actions {
+#servers {
+  .server-collection-actions {
     margin: 1em 0;
   }
   .actions > a {

data/app/controllers/rocket_job_mission_control/active_workers_controller.rb

@@ -0,0 +1,15 @@
+module RocketJobMissionControl
+  class ActiveWorkersController < RocketJobMissionControl::ApplicationController
+    # The list of workers actively processing jobs
+    # [Array[Array<server_name [String], job [RocketJob::Job], slice_id [String]]]
+    def index
+      @active_workers = RocketJob::ActiveWorker.all
+      @query          = RocketJobMissionControl::Query.new(@active_workers, name: :asc)
+
+      respond_to do |format|
+        format.html
+        format.json { render(json: ActiveWorkersDatatable.new(view_context, @query)) }
+      end
+    end
+  end
+end

data/app/controllers/rocket_job_mission_control/dirmon_entries/index_filters_controller.rb

@@ -1,47 +1,42 @@
 module RocketJobMissionControl
   module DirmonEntries
     class IndexFiltersController < RocketJobMissionControl::ApplicationController
-      before_filter :load_dirmon_entries
       before_filter :show_sidebar
 
       def pending
-        @dirmons = @dirmons.where(state: :pending)
+        @query = RocketJobMissionControl::Query.new(RocketJob::DirmonEntry.pending, name: :asc)
         respond_to do |format|
           format.html
-          format.json { render(json: DirmonEntriesDatatable.new(view_context, @dirmons)) }
+          format.json { render(json: DirmonEntriesDatatable.new(view_context, @query)) }
         end
       end
 
       def enabled
-        @dirmons = @dirmons.where(state: :enabled)
+        @query = RocketJobMissionControl::Query.new(RocketJob::DirmonEntry.enabled, name: :asc)
         respond_to do |format|
           format.html
-          format.json { render(json: DirmonEntriesDatatable.new(view_context, @dirmons)) }
+          format.json { render(json: DirmonEntriesDatatable.new(view_context, @query)) }
         end
       end
 
       def failed
-        @dirmons = @dirmons.where(state: :failed)
+        @query = RocketJobMissionControl::Query.new(RocketJob::DirmonEntry.failed, name: :asc)
         respond_to do |format|
           format.html
-          format.json { render(json: DirmonEntriesDatatable.new(view_context, @dirmons)) }
+          format.json { render(json: DirmonEntriesDatatable.new(view_context, @query)) }
         end
       end
 
       def disabled
-        @dirmons = @dirmons.where(state: :disabled)
+        @query = RocketJobMissionControl::Query.new(RocketJob::DirmonEntry.disabled, name: :asc)
         respond_to do |format|
           format.html
-          format.json { render(json: DirmonEntriesDatatable.new(view_context, @dirmons)) }
+          format.json { render(json: DirmonEntriesDatatable.new(view_context, @query)) }
         end
       end
 
       private
 
-      def load_dirmon_entries
-        @dirmons = RocketJob::DirmonEntry.where()
-      end
-
       def show_sidebar
         @dirmon_sidebar = true
       end

data/app/controllers/rocket_job_mission_control/dirmon_entries_controller.rb

@@ -6,10 +6,10 @@ module RocketJobMissionControl
     before_filter :show_sidebar
 
     def index
-      @dirmons  = RocketJob::DirmonEntry.where()
+      @query = RocketJobMissionControl::Query.new(RocketJob::DirmonEntry.all, name: :asc)
       respond_to do |format|
         format.html
-        format.json { render(json: DirmonEntriesDatatable.new(view_context, @dirmons)) }
+        format.json { render(json: DirmonEntriesDatatable.new(view_context, @query)) }
       end
     end
 
@@ -28,7 +28,6 @@ module RocketJobMissionControl
     def create
       @dirmon_entry = RocketJob::DirmonEntry.new(dirmon_params)
 
-      parse_and_assign_arguments
       parse_and_assign_properties
 
       if @dirmon_entry.errors.empty? && @dirmon_entry.save
@@ -51,7 +50,6 @@ module RocketJobMissionControl
 
     def update
       @dirmon_entry.attributes = dirmon_params
-      parse_and_assign_arguments
       parse_and_assign_properties
       if @dirmon_entry.errors.empty? && @dirmon_entry.save
         flash[:success] = t(:success, scope: [:dirmon_entry, :update])
@@ -94,19 +92,10 @@ module RocketJobMissionControl
       @dirmon_sidebar = true
     end
 
-    def parse_and_assign_arguments
-      arguments               = params[:rocket_job_dirmon_entry][:arguments] || []
-      @dirmon_entry.arguments = arguments.collect do |value|
-        cleansed = parse_array_element(value, :arguments, true)
-        @dirmon_entry.errors.add(:arguments, 'All arguments are mandatory') unless cleansed
-        cleansed
-      end
-    end
-
     def parse_and_assign_properties
       properties = params[:rocket_job_dirmon_entry].fetch(:properties, {})
       properties.each_pair do |property, value|
-        if key = @dirmon_entry.job_class.keys[property]
+        if key = @dirmon_entry.job_class.fields[property]
           if key.type == Hash
             begin
               @dirmon_entry.properties[property] = JSON.parse(value)

data/app/controllers/rocket_job_mission_control/jobs/failures_controller.rb

@@ -3,26 +3,21 @@ module RocketJobMissionControl
     class FailuresController < RocketJobMissionControl::ApplicationController
       def index
         job_failures = JobFailures.new(params[:job_id])
-        @job         = job_failures.job
-
-        if @job && @job.failed?
+        if @job = job_failures.job
           @slice_errors = job_failures.list
 
           if @slice_errors.present?
-            @error_type = params[:error_type] || @slice_errors.first['_id']['error_class']
+            @error_type = params[:error_type] || @slice_errors.first.class_name
 
             offset             = params.fetch(:offset, 0).to_i
-            selected_exception = job_failures.for_error(@error_type, offset)
-            current_failure    = selected_exception.first
+            count              = @slice_errors.find { |exception| exception.class_name == @error_type }.try!(:count) || 0
+            current_failure    = job_failures.for_error(@error_type, offset)
+            @failure_exception = current_failure.try!(:exception)
 
             @pagination = {
               offset: offset,
-              total:  (selected_exception.count - 1),
+              total:  (count - 1),
             }
-
-            if current_failure.present?
-              @failure_exception = current_failure['exception']
-            end
           else
             flash[:notice] = t(:no_errors, scope: [:job, :failures])
           end

data/app/controllers/rocket_job_mission_control/jobs/index_filters_controller.rb

@@ -3,59 +3,79 @@ module RocketJobMissionControl
     class IndexFiltersController < RocketJobMissionControl::ApplicationController
       before_filter :show_sidebar
 
+      COMMON_FIELDS    = [:id, :_type, :description, :completed_at, :created_at, :started_at, :state].freeze
+      RUNNING_FIELDS   = COMMON_FIELDS + [:record_count, :collect_output, :input_categories, :output_categories, :encrypt, :compress, :slice_size, :priority, :sub_state, :percent_complete].freeze
+      QUEUED_FIELDS    = COMMON_FIELDS + [:run_at, :priority].freeze
+      SCHEDULED_FIELDS = COMMON_FIELDS + [:run_at, :cron_schedule].freeze
+
       def running
-        @jobs = RocketJob::Job.where(state: :running).sort(started_at: :desc)
+        @jobs                  = RocketJob::Job.running.only(RUNNING_FIELDS)
+        @query                 = RocketJobMissionControl::Query.new(@jobs, started_at: :desc)
+        @query.display_columns = %w[_type description runs_in cron_schedule completed_at]
+
         respond_to do |format|
           format.html
-          format.json { render(json: RunningJobsDatatable.new(view_context, @jobs)) }
+          format.json { render(json: RunningJobsDatatable.new(view_context, @query)) }
         end
       end
 
       def paused
-        @jobs = RocketJob::Job.where(state: :paused).sort(completed_at: :desc)
+        @jobs                  = RocketJob::Job.paused.only(COMMON_FIELDS)
+        @query                 = RocketJobMissionControl::Query.new(@jobs, completed_at: :desc)
+        @query.display_columns = %w[_type description completed_at]
         respond_to do |format|
           format.html
-          format.json { render(json: InterruptedJobsDatatable.new(view_context, @jobs)) }
+          format.json { render(json: InterruptedJobsDatatable.new(view_context, @query)) }
         end
       end
 
       def completed
-        @jobs = RocketJob::Job.where(state: :completed).sort(completed_at: :desc)
+        @jobs                  = RocketJob::Job.completed.only(COMMON_FIELDS)
+        @query                 = RocketJobMissionControl::Query.new(@jobs, completed_at: :desc)
+        @query.display_columns = %w[_type description duration completed_at]
         respond_to do |format|
           format.html
-          format.json { render(json: CompletedJobsDatatable.new(view_context, @jobs)) }
+          format.json { render(json: CompletedJobsDatatable.new(view_context, @query)) }
         end
       end
 
       def aborted
-        @jobs = RocketJob::Job.where(state: :aborted).sort(completed_at: :desc)
+        @jobs                  = RocketJob::Job.aborted.only(COMMON_FIELDS)
+        @query                 = RocketJobMissionControl::Query.new(@jobs, completed_at: :desc)
+        @query.display_columns = %w[_type description completed_at]
         respond_to do |format|
           format.html
-          format.json { render(json: InterruptedJobsDatatable.new(view_context, @jobs)) }
+          format.json { render(json: InterruptedJobsDatatable.new(view_context, @query)) }
         end
       end
 
       def failed
-        @jobs = RocketJob::Job.where(state: :failed).sort(completed_at: :desc)
+        @jobs                  = RocketJob::Job.failed.only(COMMON_FIELDS)
+        @query                 = RocketJobMissionControl::Query.new(@jobs, completed_at: :desc)
+        @query.display_columns = %w[_type description completed_at]
         respond_to do |format|
           format.html
-          format.json { render(json: InterruptedJobsDatatable.new(view_context, @jobs)) }
+          format.json { render(json: InterruptedJobsDatatable.new(view_context, @query)) }
         end
       end
 
       def queued
-        @jobs = RocketJob::Job.queued_now.sort(created_at: :desc)
+        @jobs                  = RocketJob::Job.queued_now.only(QUEUED_FIELDS)
+        @query                 = RocketJobMissionControl::Query.new(@jobs, completed_at: :desc)
+        @query.display_columns = %w[_type description priority queued_for]
         respond_to do |format|
           format.html
-          format.json { render(json: QueuedJobsDatatable.new(view_context, @jobs)) }
+          format.json { render(json: QueuedJobsDatatable.new(view_context, @query)) }
         end
       end
 
       def scheduled
-        @jobs = RocketJob::Job.scheduled.sort(run_at: :asc)
+        @jobs                  = RocketJob::Job.scheduled.only(SCHEDULED_FIELDS)
+        @query                 = RocketJobMissionControl::Query.new(@jobs, run_at: :asc)
+        @query.display_columns = %w[_type description runs_in cron_schedule]
         respond_to do |format|
           format.html
-          format.json { render(json: ScheduledJobsDatatable.new(view_context, @jobs)) }
+          format.json { render(json: ScheduledJobsDatatable.new(view_context, @query)) }
         end
       end
 
@@ -64,6 +84,7 @@ module RocketJobMissionControl
       def show_sidebar
         @jobs_sidebar = true
       end
+
     end
   end
 end

data/app/controllers/rocket_job_mission_control/jobs_controller.rb

@@ -5,10 +5,10 @@ module RocketJobMissionControl
     rescue_from StandardError, with: :error_occurred
 
     def index
-      @jobs  = RocketJob::Job.sort(_id: :desc)
+      @query = RocketJobMissionControl::Query.new(RocketJob::Job.all, id: :desc)
       respond_to do |format|
         format.html
-        format.json { render(json: JobsDatatable.new(view_context, @jobs)) }
+        format.json { render(json: JobsDatatable.new(view_context, @query)) }
       end
     end
 
@@ -28,13 +28,8 @@ module RocketJobMissionControl
     end
 
     def destroy
-      if @job.completed? || @job.aborted?
-        @job.destroy
-        redirect_to(jobs_path)
-      else
-        flash[:alert] = 'Cannot destroy a job unless it is completed or aborted'
-        redirect_to(job_path(@job))
-      end
+      @job.destroy
+      redirect_to(jobs_path)
     end
 
     def retry
@@ -56,7 +51,7 @@ module RocketJobMissionControl
     end
 
     def run_now
-      @job.update_attribute(:run_at, nil) if @job.scheduled?
+      @job.unset(:run_at) if @job.scheduled?
       redirect_to scheduled_jobs_path
     end
 
@@ -72,6 +67,10 @@ module RocketJobMissionControl
     def edit
     end
 
+    def exceptions
+      @exceptions = @job.input.group_exceptions
+    end
+
     private
 
     def show_sidebar
@@ -79,9 +78,7 @@ module RocketJobMissionControl
     end
 
     def find_job_or_redirect
-      @job = RocketJob::Job.find(params[:id])
-
-      if @job.nil?
+      unless @job = RocketJob::Job.where(id: params[:id]).first
         flash[:alert] = t(:failure, scope: [:job, :find], id: params[:id])
 
         redirect_to(jobs_path)
@@ -93,14 +90,14 @@ module RocketJobMissionControl
     end
 
     def job_params
-      params.require(:job).permit(RocketJob::Job.rocket_job_properties)
+      params.require(:job).permit(RocketJob::Job.user_editable_fields)
     end
 
     def error_occurred(exception)
       if defined?(SemanticLogger::Logger) && logger.is_a?(SemanticLogger::Logger)
         logger.error 'Error loading a job', exception
       else
-        logger.error "Error loading a job. #{log.exception.class}: #{log.exception.message}\n#{(log.exception.backtrace || []).join("\n")}"
+        logger.error "Error loading a job. #{exception.class}: #{exception.message}\n#{(exception.backtrace || []).join("\n")}"
       end
       flash[:danger] = 'Error loading jobs.'
       raise exception if Rails.env.development?

data/app/controllers/rocket_job_mission_control/servers/index_filters_controller.rb

@@ -0,0 +1,49 @@
+module RocketJobMissionControl
+  module Servers
+    class IndexFiltersController < RocketJobMissionControl::ApplicationController
+      before_filter :show_sidebar
+
+      def starting
+        @servers = RocketJob::Server.starting
+        @query   = RocketJobMissionControl::Query.new(@servers, name: :asc)
+        respond_to do |format|
+          format.html
+          format.json { render(json: ServersDatatable.new(view_context, @query)) }
+        end
+      end
+
+      def running
+        @servers = RocketJob::Server.running
+        @query   = RocketJobMissionControl::Query.new(@servers, name: :asc)
+        respond_to do |format|
+          format.html
+          format.json { render(json: ServersDatatable.new(view_context, @query)) }
+        end
+      end
+
+      def paused
+        @servers = RocketJob::Server.paused
+        @query   = RocketJobMissionControl::Query.new(@servers, name: :asc)
+        respond_to do |format|
+          format.html
+          format.json { render(json: ServersDatatable.new(view_context, @query)) }
+        end
+      end
+
+      def stopping
+        @servers = RocketJob::Server.stopping
+        @query   = RocketJobMissionControl::Query.new(@servers, name: :asc)
+        respond_to do |format|
+          format.html
+          format.json { render(json: ServersDatatable.new(view_context, @query)) }
+        end
+      end
+
+      private
+
+      def show_sidebar
+        @servers_sidebar = true
+      end
+    end
+  end
+end

data/app/controllers/rocket_job_mission_control/servers_controller.rb

@@ -0,0 +1,93 @@
+module RocketJobMissionControl
+  class ServersController < RocketJobMissionControl::ApplicationController
+    before_filter :find_server, only: [:stop, :pause, :resume, :destroy]
+    before_filter :show_sidebar
+
+    def index
+      @query = RocketJobMissionControl::Query.new(RocketJob::Server.all, name: :asc)
+      respond_to do |format|
+        format.html
+        format.json { render(json: ServersDatatable.new(view_context, @query)) }
+      end
+    end
+
+    VALID_STATES = {
+      stop_all:        'stopped',
+      pause_all:       'paused',
+      resume_all:      'resumed',
+      destroy_zombies: 'destroyed if zombified',
+    }
+
+    def update_all
+      server_action = params[:server_action].to_sym
+      if VALID_STATES.keys.include?(server_action)
+        RocketJob::Server.send(server_action.to_sym)
+        flash[:notice] = t(:success, scope: [:server, :update_all], server_action: VALID_STATES[server_action])
+      else
+        flash[:alert] = t(:invalid, scope: [:server, :update_all])
+      end
+
+      respond_to do |format|
+        format.html { redirect_to servers_path }
+      end
+    end
+
+    def stop
+      if @server.stop!
+        flash[:notice] = t(:success, scope: [:server, :stop])
+      else
+        flash[:alert] = t(:failure, scope: [:server, :stop])
+      end
+
+      respond_to do |format|
+        format.html { redirect_to servers_path }
+      end
+    end
+
+    def destroy
+      if @server.nil? || @server.destroy
+        flash[:notice] = t(:success, scope: [:server, :destroy])
+      else
+        flash[:alert] = t(:failure, scope: [:server, :destroy])
+      end
+
+      respond_to do |format|
+        format.html { redirect_to servers_path }
+      end
+    end
+
+    def pause
+      if @server.pause!
+        flash[:notice] = t(:success, scope: [:server, :pause])
+      else
+        flash[:alert] = t(:failure, scope: [:server, :pause])
+      end
+
+      respond_to do |format|
+        format.html { redirect_to servers_path }
+      end
+    end
+
+    def resume
+      if @server.resume!
+        flash[:notice] = t(:success, scope: [:server, :resume])
+      else
+        flash[:alert] = t(:failure, scope: [:server, :resume])
+      end
+
+      respond_to do |format|
+        format.html { redirect_to servers_path }
+      end
+    end
+
+    private
+
+    def find_server
+      @server = RocketJob::Server.find(params[:id])
+    end
+
+    def show_sidebar
+      @servers_sidebar = true
+    end
+  end
+end