rocketjob_mission_control 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8d7c96f03155c733cf07a5e81796020552dd378
-  data.tar.gz: cf0647850f7b019530b1f1c6d4a511dbcb5fcc5b
+  metadata.gz: 304c034afa2db7c0db432bc35a23cf61a98bb0ea
+  data.tar.gz: af4d336900d12e6f2aa7b3913e024ff7bd3dec8b
 SHA512:
-  metadata.gz: 4639ef836e562dc597c5e0651571111ac84b3a217b3599da8f06807513375c73b44eb9a091517da37c57f6fa9d478fa2f23f75825ef6c8afad0e899f4892d67b
-  data.tar.gz: fe70a9fd5c6cbd029443dda89be419f9c08b6de28fe3a90f2908bccd753f3d4c5837fb239e9d970170e3849c7086e33d9ee5b38518298676b0844308298b9303
+  metadata.gz: 322c4304792cba14b21561dbea0e3f33e7bcbe44db1dd4a21ae5598b9e9e8af4ae32a7e02419cc37344e3a687ac5e8089694d790ee00345cb3470a8b9026d0bb
+  data.tar.gz: 8c512bd2504b5f0dfd1acff972d661219a45d8ec53c4dd7c43696f62e10b94acb7d0c4301dbab2ec2831e8b38d3647b46203de897014d18644690e9e424eac8e

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

@@ -47,3 +47,6 @@
 .callout-alert-top {
   border-top-color: #ce4844;
 }
+.callout-zombie-top {
+  border-top-color: darkred;
+}

data/app/controllers/rocket_job_mission_control/dirmon_entries_controller.rb

@@ -76,15 +76,14 @@ module RocketJobMissionControl
     private
 
     def parse_and_assign_arguments
-      if arguments = params[:rocket_job_dirmon_entry][:arguments]
-        begin
-          arguments               = JSON.parse(arguments)
-          @dirmon_entry.arguments = arguments.kind_of?(Array) ? arguments : [arguments]
-        rescue JSON::ParserError => e
-          @dirmon_entry.errors.add(:arguments, e.message)
-        end
+      arguments = params[:rocket_job_dirmon_entry][:arguments]
+      arguments = arguments.blank? ? '[]' : arguments
+      begin
+        arguments               = JSON.parse(arguments)
+        @dirmon_entry.arguments = arguments.kind_of?(Array) ? arguments : [arguments]
+      rescue JSON::ParserError => e
+        @dirmon_entry.errors.add(:arguments, e.message)
       end
-
     end
 
     def clean_values
@@ -116,7 +115,7 @@ module RocketJobMissionControl
     def dirmon_params
       params
         .require(:rocket_job_dirmon_entry)
-        .permit(:name, :archive_directory, :pattern, :job_class_name).tap do |whitelist|
+        .permit(:name, :archive_directory, :pattern, :job_class_name, :perform_method).tap do |whitelist|
         whitelist[:properties] = params[:rocket_job_dirmon_entry][:properties] if params[:rocket_job_dirmon_entry][:properties]
       end
     end

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

@@ -7,21 +7,25 @@ module RocketJobMissionControl
 
         if @job && @job.failed?
           @slice_errors = job_failures.list
-          @error_type   = params[:error_type] || @slice_errors.first['_id']['error_class']
 
-          offset             = params.fetch(:offset, 1).to_i
-          selected_exception = job_failures.for_error(@error_type, offset)
-          current_failure    = selected_exception.first
+          if @slice_errors.present?
+            @error_type   = params[:error_type] || @slice_errors.first['_id']['error_class']
 
-          @pagination = {
-            offset: offset,
-            total:  (selected_exception.count - 1),
-          }
+            offset             = params.fetch(:offset, 0).to_i
+            selected_exception = job_failures.for_error(@error_type, offset)
+            current_failure    = selected_exception.first
 
-          if current_failure.present?
-            @failure_exception = current_failure['exception']
-          end
+            @pagination = {
+              offset: offset,
+              total:  (selected_exception.count - 1),
+            }
 
+            if current_failure.present?
+              @failure_exception = current_failure['exception']
+            end
+          else
+            flash[:notice] = t(:no_errors, scope: [:job, :failures])
+          end
         else
           redirect_to(job_path(params[:job_id]))
         end

data/app/controllers/rocket_job_mission_control/workers_controller.rb

@@ -6,12 +6,17 @@ module RocketJobMissionControl
       @workers = RocketJob::Worker.sort(:name)
     end
 
-    VALID_STATES = { stop: 'stopped', pause: 'paused', resume: 'resumed' }
+    VALID_STATES = {
+      stop_all:        'stopped',
+      pause_all:       'paused',
+      resume_all:      'resumed',
+      destroy_zombies: 'destroyed if zombified',
+    }
 
     def update_all
       worker_action = params[:worker_action].to_sym
       if VALID_STATES.keys.include?(worker_action)
-        RocketJob::Worker.send("#{worker_action}_all".to_sym)
+        RocketJob::Worker.send(worker_action.to_sym)
         flash[:notice] = t(:success, scope: [:worker, :update_all], worker_action: VALID_STATES[worker_action])
       else
         flash[:alert]  = t(:invalid, scope: [:worker, :update_all])

data/app/helpers/rocket_job_mission_control/workers_helper.rb

@@ -2,12 +2,16 @@ module RocketJobMissionControl
   module WorkersHelper
 
     def worker_card_class(worker)
-      map = {
-        running:  'callout-success-top',
-        paused:   'callout-warning-top',
-        stopping: 'callout-alert-top',
-      }
-      map[worker.state] || 'callout-info-top'
+      if worker.zombie?
+        'callout-zombie-top'
+      else
+        map = {
+          running:  'callout-success-top',
+          paused:   'callout-warning-top',
+          stopping: 'callout-alert-top',
+        }
+        map[worker.state] || 'callout-info-top'
+      end
     end
 
   end

data/app/views/layouts/rocket_job_mission_control/application.html.haml

@@ -27,7 +27,7 @@
       #page-content-wrapper
         = render partial: 'layouts/rocket_job_mission_control/partials/header'
 
-        .flash
+        .flash.text-center
           - flash.each do |key, msg|
             - if msg
               .alert{class: "alert-#{key} alert-dismissable", role: 'alert'}

data/app/views/rocket_job_mission_control/dirmon_entries/_form.html.haml

@@ -18,6 +18,9 @@
   .job.form-group
     = f.label :job_class_name
     = f.text_field :job_class_name, class: 'form-control'
+  .job.form-group
+    = f.label :perform_method
+    = f.text_field :perform_method, class: 'form-control'
   .job_arguments.form-group
     = f.label :arguments
     = f.text_area :arguments,

data/app/views/rocket_job_mission_control/dirmon_entries/_status.html.haml

@@ -7,6 +7,9 @@
 %div
   %label Job Class Name:
   = @dirmon_entry.job_class_name
+%div
+  %label Perform Method:
+  = @dirmon_entry.perform_method
 %div
   %label Archive Directory:
   = @dirmon_entry.archive_directory

data/app/views/rocket_job_mission_control/jobs/running.html.haml

@@ -17,7 +17,8 @@
           - if job.kind_of?(RocketJob::SlicedJob)
             .slice_count
               %label Slices Running:
-              = job.input.find_all { |s| s.state == :running }.count
+              -#= job.input.find_all { |s| s.state == :running }.count
+              = job.input.collection.aggregate([{ '$match' => { state: 'queued' } },{ '$group' => { _id: nil, count: { '$sum' => 1 } } }] )
           - else
             .worker
               %label Worker:

data/app/views/rocket_job_mission_control/workers/index.html.haml

@@ -5,11 +5,11 @@
         %ol.breadcrumb{ style: 'margin-bottom: 0'}
           %li.active Workers
           .btn-group.pull-right
-            - [:stop, :pause, :resume].each do |action|
-              = link_to("#{action.to_s.capitalize} All",
+            - [:stop_all, :pause_all, :resume_all, :destroy_zombies].each do |action|
+              = link_to("#{action.to_s.humanize.capitalize}",
                 rocket_job_mission_control.update_all_workers_path(worker_action: action),
                 method: :patch,
-                data: { confirm: t(:confirm, scope: [:worker, :update_all], action: action) },
+                data: { confirm: t(:confirm, scope: [:worker, :update_all], action: action.to_s.singularize.humanize.downcase) },
                 class: 'btn btn-default')
           .clearfix
 
@@ -37,7 +37,11 @@
 
                 .time
                   %b Started:
-                  = worker.started_at.strftime("%b, %d %Y at %l:%M %p")
+                  = "#{RocketJob.seconds_as_duration(Time.now - worker.started_at)} ago"
+
+                .heartbeat
+                  %b Last Heartbeat:
+                  = "#{RocketJob.seconds_as_duration(Time.now - worker.heartbeat.updated_at)} ago"
 
                 .actions
                   = render partial: 'actions', locals: { worker: worker }

data/config/locales/en.yml

@@ -52,12 +52,14 @@ en:
     update_all:
       success: "Workers have been %{worker_action}."
       invalid: "Action not allowed."
-      confirm: "Are you sure you want to %{action} all workers?"
+      confirm: "Are you sure you want to %{action} workers?"
   job:
     find:
       failure: "Could not find job with id: %{id}!"
     action:
       confirm: "Are you sure you want to %{action} this job?"
+    failures:
+      no_errors: 'No slice failures present.'
 
   dirmon_entry:
     find:

data/lib/rocket_job_mission_control/version.rb

@@ -1,3 +1,3 @@
 module RocketJobMissionControl
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/spec/controllers/dirmon_entries_controller_spec.rb

@@ -5,6 +5,11 @@ class FakeButGoodJob < RocketJob::Job
   def perform(id)
     id
   end
+
+  def perform_with_no_params
+    100_000
+  end
+
 end
 
 module RocketJobMissionControl
@@ -185,52 +190,61 @@ module RocketJobMissionControl
 
     describe 'POST #create' do
       context 'with valid parameters' do
-        let(:dirmon_params) do
-          {
-            name: 'Test',
-            pattern: '/files/',
-            job_class_name: 'FakeButGoodJob',
-            arguments: [ 42 ].to_json,
-            properties: { description: '', priority: 42 },
-          }
-        end
 
-        before do
-          post :create, rocket_job_dirmon_entry: dirmon_params
-        end
+        {
+          perform: { argument: [42].to_json, expected_value: [42] },
+          perform_with_no_params: { argument: '', expected_value: [] },
+        }.each_pair do |perform_method, arguments|
+          context "and arguments are '#{arguments}'" do
+            let(:dirmon_params) do
+              {
+                name: 'Test',
+                pattern: '/files/',
+                job_class_name: 'FakeButGoodJob',
+                arguments: arguments[:argument],
+                properties: { description: '', priority: 42 },
+                perform_method: perform_method,
+              }
+            end
 
-        it 'creates the entry' do
-          expect(assigns(:dirmon_entry)).to be_persisted
-        end
+            before do
+              post :create, rocket_job_dirmon_entry: dirmon_params
+            end
 
-        it 'has no errors' do
-          expect(assigns(:dirmon_entry).errors.messages).to be_empty
-        end
+            it 'creates the entry' do
+              expect(assigns(:dirmon_entry)).to be_persisted
+            end
 
-        it 'redirects to created entry' do
-          expect(response).to redirect_to(dirmon_entry_path(assigns(:dirmon_entry)))
-        end
+            it 'has no errors' do
+              expect(assigns(:dirmon_entry).errors.messages).to be_empty
+            end
 
-        it 'does not load all entries' do
-          expect(dirmon_list).to_not have_received(:sort)
-        end
+            it 'redirects to created entry' do
+              expect(response).to redirect_to(dirmon_entry_path(assigns(:dirmon_entry)))
+            end
 
-        it 'does not save blank properties' do
-          expect(assigns(:dirmon_entry).properties[:description]).to eq(nil)
-        end
+            it 'does not load all entries' do
+              expect(dirmon_list).to_not have_received(:sort)
+            end
 
-        it 'saves properties' do
-          expect(assigns(:dirmon_entry).properties[:priority]).to eq('42')
-        end
+            it 'does not save blank properties' do
+              expect(assigns(:dirmon_entry).properties[:description]).to eq(nil)
+            end
 
-        [:name, :pattern, :job_class_name].each do |attribute|
-          it "assigns the correct value for #{attribute}" do
-            expect(assigns(:dirmon_entry)[attribute]).to eq(dirmon_params[attribute])
-          end
-        end
+            it 'saves properties' do
+              expect(assigns(:dirmon_entry).properties[:priority]).to eq('42')
+            end
 
-        it 'persists arguments correctly' do
-          expect(assigns(:dirmon_entry).arguments).to eq([42])
+            [:name, :pattern, :job_class_name].each do |attribute|
+              it "assigns the correct value for #{attribute}" do
+                expect(assigns(:dirmon_entry)[attribute]).to eq(dirmon_params[attribute])
+              end
+            end
+
+            it 'persists arguments correctly' do
+              expect(assigns(:dirmon_entry).arguments).to eq(arguments[:expected_value])
+            end
+          end
         end
       end
 

data/spec/controllers/jobs/failures_controller_spec.rb

@@ -29,17 +29,39 @@ module RocketJobMissionControl
           get :index, job_id: job.id
         end
 
-        it 'succeeds' do
-          expect(response).to be_success
+        context 'with slice errors' do
+          it 'succeeds' do
+            expect(response).to be_success
+          end
+          it 'returns the job' do
+            expect(assigns(:job)).to eq(job)
+          end
+          it 'returns the errors' do
+            expect(assigns(:slice_errors)).to eq(slice_errors)
+          end
+          it 'returns the first exception' do
+            expect(assigns(:failure_exception)).to eq(current_failure['exception'])
+          end
         end
-        it 'returns the job' do
-          expect(assigns(:job)).to eq(job)
-        end
-        it 'returns the errors' do
-          expect(assigns(:slice_errors)).to eq(slice_errors)
-        end
-        it 'returns the first exception' do
-          expect(assigns(:failure_exception)).to eq(current_failure['exception'])
+
+        context 'with no slice errors' do
+          let(:slice_errors) { [] }
+
+          it 'succeeds' do
+            expect(response).to be_success
+          end
+          it 'returns the job' do
+            expect(assigns(:job)).to eq(job)
+          end
+          it 'returns no errors' do
+            expect(assigns(:slice_errors)).to eq(slice_errors)
+          end
+          it 'returns no exception' do
+            expect(assigns(:failure_exception)).to be_nil
+          end
+          it 'notifies the user' do
+            expect(flash[:notice]).to eq(I18n.t(:no_errors, scope: [:job, :failures]))
+          end
         end
       end
 

data/spec/controllers/workers_controller_spec.rb

@@ -49,7 +49,7 @@ module RocketJobMissionControl
       RocketJobMissionControl::WorkersController::VALID_STATES.each do |worker_action, action_message|
         context "with '#{worker_action}' as the worker_action param" do
           before do
-            allow(RocketJob::Worker).to receive("#{worker_action}_all".to_sym)
+            allow(RocketJob::Worker).to receive(worker_action.to_sym)
             patch :update_all, worker_action: worker_action
           end