rocketjob_mission_control 2.1.1 → 3.0.0.rc1

data/app/helpers/rocket_job_mission_control/{workers_helper.rb → servers_helper.rb}

@@ -1,21 +1,21 @@
 module RocketJobMissionControl
-  module WorkersHelper
-    def worker_counts_by_state(state)
-      RocketJob::Worker.counts_by_state.fetch(state.downcase.to_sym, 0)
+  module ServersHelper
+    def server_counts_by_state(state)
+      RocketJob::Server.counts_by_state.fetch(state.downcase.to_sym, 0)
     end
 
-    def worker_icon(worker)
+    def server_icon(server)
       state =
-        if worker.zombie?
+        if server.zombie?
           'zombie'
         else
-          worker.state
+          server.state
         end
       state_icon(state)
     end
 
-    def worker_card_class(worker)
-      if worker.zombie?
+    def server_card_class(server)
+      if server.zombie?
         'callout-zombie'
       else
         map = {
@@ -23,7 +23,7 @@ module RocketJobMissionControl
           paused:   'callout-warning',
           stopping: 'callout-alert',
         }
-        map[worker.state] || 'callout-info'
+        map[server.state] || 'callout-info'
       end
     end
   end

data/app/models/job_failures.rb

@@ -10,24 +10,11 @@ class JobFailures
   end
 
   def list
-    @slice_errors ||= job.input.collection.aggregate(
-      [
-        {
-          '$match' => {state: 'failed'}
-        },
-        {
-          '$group' => {
-            _id:      {error_class: '$exception.class_name'},
-            messages: {'$addToSet' => '$exception.message'},
-            count:    {'$sum' => 1}
-          },
-        }
-      ]
-    )
+    @slice_errors ||= job.input.group_exceptions
   end
 
   def for_error(error_type, page_offset=0)
-    query = {'state' => 'failed', 'exception.class_name' => error_type}
-    @job.input.collection.find(query).limit(1).skip(page_offset)
+    query = {'exception.class_name' => error_type}
+    job.input.failed.where(query).limit(1).skip(page_offset).first
   end
 end

data/app/models/rocket_job_mission_control/query.rb

@@ -0,0 +1,51 @@
+module RocketJobMissionControl
+  class Query
+    attr_reader :scope, :default_order
+    attr_accessor :search_term, :order_by, :search_term, :start, :page_size,
+      :search_columns, :display_columns
+
+    def initialize(scope, default_order = {})
+      @scope           = scope
+      @order_by        = @default_order = default_order
+      @search_columns  = []
+      @display_columns = []
+    end
+
+    # Returns the filtered query expression
+    def unsorted_query
+      records = scope
+      # Text Search
+      if search_term
+        escaped = Regexp.escape(search_term)
+        regexp  = Regexp.new(escaped, Regexp::IGNORECASE)
+        if search_columns.size == 1
+          records = records.where(search_columns.first => regexp)
+        else
+          cols    = search_columns.collect { |col| {col => regexp} }
+          records = records.where('$or' => cols)
+        end
+      end
+
+      # Pagination
+      if start && page_size
+        records = records.skip(start).limit(page_size)
+      end
+      records
+    end
+
+    # Returns the filtered query expression with the sort applied
+    def query
+      # Sort must be applied last
+      order_by ? unsorted_query.sort(order_by) : unsorted_query
+    end
+
+    def count
+      unsorted_query.count
+    end
+
+    def unfiltered_count
+      scope.count
+    end
+
+  end
+end

data/app/views/layouts/rocket_job_mission_control/partials/_header.html.haml

@@ -16,13 +16,13 @@
             %i.fa.fa-home
             Jobs
         %li
-          = link_to workers_path, class: active_page(workers_path) do
+          = link_to servers_path, class: active_page(servers_path) do
             %i.fa.fa-database
             Servers
         %li
-          = link_to active_processes_path, class: active_page(active_processes_path) do
+          = link_to active_workers_path, class: active_page(active_workers_path) do
             %i.fa.fa-circle-o-notch
-            Activity
+            Workers
         %li
           = link_to enabled_dirmon_entries_path, class: active_page(enabled_dirmon_entries_path) do
             %i.fa.fa-folder-o

data/app/views/layouts/rocket_job_mission_control/partials/_sidebar.html.haml

@@ -7,5 +7,5 @@
     = render partial: 'rocket_job_mission_control/jobs/sidebar'
   - if @dirmon_sidebar
     = render partial: 'rocket_job_mission_control/dirmon_entries/sidebar'
-  - if @workers_sidebar
-    = render partial: 'rocket_job_mission_control/workers/sidebar'
+  - if @servers_sidebar
+    = render partial: 'rocket_job_mission_control/servers/sidebar'

data/app/views/rocket_job_mission_control/{active_processes → active_workers}/index.html.haml

@@ -6,10 +6,10 @@
       .col-sm-2
         .btn.btn-default.pull-right.dt-reload{ data: { behavior: 'reload' } }
           %i.fa.fa-refresh
-    %table.table.datatable.active-processes-datatable{ style: "width: 100%", data: { source: "#{active_processes_url(format: 'json')}", column_num: 4 } }
+    %table.table.datatable.active-workers-datatable{ style: "width: 100%", data: { source: "#{active_workers_url(format: 'json')}", column_num: 4 } }
       %thead
         %tr
-          %th Hostname : PID
+          %th Worker Name
           %th Class
           %th Description
           %th Started
@@ -18,7 +18,7 @@
 :javascript
   jQuery(function() {
     new RjmcDatatable(
-      $('.active-processes-datatable'),
+      $('.active-workers-datatable'),
       [{data: '0'}, {data: '1'}, {data: '2'}, {data: '3'}],
       {ordering: false, searching: false});
   });

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

@@ -1,34 +1,23 @@
 - if @dirmon_entry.job_class
   .arguments
     .job_arguments.form-group
-      - count = @dirmon_entry.job_class.rocket_job_argument_count
-      - count.times do |counter|
-        - argument = @dirmon_entry.arguments[counter]
-        = f.label "Argument #{counter + 1}:"
-        = f.text_field :arguments,
-          value: argument.is_a?(Hash) || argument.is_a?(Array) ? argument.to_json : argument,
-          name: 'rocket_job_dirmon_entry[arguments][]',
-          rows: 10,
-          placeholder: '{"argument1":"value1", "argument2":"value2", "argument3":"value3"}',
-          class: 'form-control'
     = f.fields_for :properties do |properties|
-      - @dirmon_entry.job_class.rocket_job_properties.each do |property_name|
-        - next if property_name == :arguments
-        - key = @dirmon_entry.job_class.keys[property_name.to_s]
-        - next unless key && key.type
-        - placeholder = key.default? ? key.default : nil
+      - @dirmon_entry.job_class.user_editable_fields.each do |property_name|
+        - field = @dirmon_entry.job_class.fields[property_name.to_s]
+        - next unless field && field.type
+        - placeholder = field.default_val
         .form-group
           = properties.label property_name.to_s
-          - case key.type.name
+          - case field.type.name
           - when 'Integer'
             = properties.number_field property_name, value: @dirmon_entry.properties[property_name], class: 'form-control', placeholder: placeholder
           - when 'Hash'
             - value = @dirmon_entry.properties[property_name]
-            = properties.text_field property_name, value: value ? value.to_json : '', class: 'form-control', placeholder: '{"argument1":"value1", "argument2":"value2", "argument3":"value3"}'
+            = properties.text_field property_name, value: value ? value.to_json : '', class: 'form-control', placeholder: '{"key1":"value1", "key2":"value2", "key3":"value3"}'
           - when 'Array'
             - options = Array(@dirmon_entry.properties[property_name])
             = properties.select property_name, options_for_select(options, options), {include_hidden: false}, {class: 'selectize', multiple: true}
-          - when 'Boolean'
+          - when 'Mongoid::Boolean'
             - name = "#{property_name}_true".to_sym
             .radio-buttons
               = properties.label name, 'true'

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

@@ -10,11 +10,6 @@
 %div
   %label Archive Directory:
   = @dirmon_entry.archive_directory
--if @dirmon_entry.arguments.size > 0
-  .parameters
-    %label Arguments:
-    %pre
-      %code= pretty_print_array_or_hash(@dirmon_entry.arguments)
 - @dirmon_entry.properties.each_pair do |name, value|
   .parameters
     %label= "#{name.to_s.titleize}:"

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

@@ -8,14 +8,15 @@
         = @dirmon_entry.state
 
     .btn-toolbar.job-actions.pull-right
-      .btn-group{ style: 'margin-right: 1em;' }
-        = link_to "Destroy", dirmon_entry_path(@dirmon_entry), method: :delete, class: 'btn btn-default', :data => { :confirm => 'Are you sure?' }
+      .btn-group
+        = link_to "Edit", edit_dirmon_entry_path(@dirmon_entry), class: "btn btn-default"
+      .btn-group
         - if @dirmon_entry.disabled? || @dirmon_entry.pending?
           = link_to "Enable", enable_dirmon_entry_path(@dirmon_entry.id), method: :put, class: "btn btn-default"
         - if @dirmon_entry.enabled?
           = link_to "Disable", disable_dirmon_entry_path(@dirmon_entry.id), method: :put, class: "btn btn-default", :data => { :confirm => 'Are you sure?' }
       .btn-group
-        = link_to "Edit", edit_dirmon_entry_path(@dirmon_entry), class: "btn btn-default"
+        = link_to "Destroy", dirmon_entry_path(@dirmon_entry), method: :delete, class: 'btn btn-default', :data => { :confirm => 'Are you sure?' }
 
     .clearfix
 

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

@@ -1,31 +1,36 @@
 - status = job.status(Time.zone)
 .id
   %label ID:
-  = status.delete('id')
-.status-message
-  %label Description:
-  = status.delete('description')
-.status-message
-  %label Duration:
-  = status.delete('duration')
-.status-message
-  %label Record Count:
-  = status.delete('record_count')
+  = status.delete('_id')
+- if description = status.delete('description')
+  .status-message
+    %label Description:
+    = description
+- if duration = status.delete('duration')
+  .status-message
+    %label Duration:
+    = duration
+- if record_count = status.delete('record_count')
+  .status-message
+    %label Record Count:
+    = record_count
 .created_at
   %label Created At:
   = status.delete('created_at')
-.status-message
-  %label Started At:
-  = status.delete('started_at')
-.status-message
-  %label % Complete:
-  = status.delete('percent_complete')
+- if started_at = status.delete('started_at')
+  .status-message
+    %label Started At:
+    = started_at
+- if percent_complete = status.delete('percent_complete')
+  .status-message
+    %label % Complete:
+    = percent_complete
 
 - remaining = {}
 - status.each_pair do |key, value|
   - next if value.blank?
   .status-message
-  - if ['state', '_type'].include?(key)
+  - if ['state', '_type', 'sub_state'].include?(key)
   - elsif value.kind_of?(Hash) || value.kind_of?(Array)
     - remaining[key] = value
   - else

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

@@ -18,7 +18,7 @@
         = f.number_field :priority, value: @job.priority, class: 'form-control'
       .col-md-4
         = f.label :log_level
-        = f.select :log_level, ['trace', 'debug', 'info', 'warn', 'error', 'fatal'], { include_blank: true }, { class: 'form-control' }
+        = f.select :log_level, SemanticLogger::LEVELS.collect(&:to_s), { include_blank: true }, { class: 'form-control' }
       - if @job.respond_to?(:max_active_workers)
         .col-md-4
           = f.label :max_active_workers

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

@@ -0,0 +1,29 @@
+.job-list
+  .list
+    .row
+      .col-sm-10
+        %h2 Exceptions
+        = link_to(@job.class.name, job_path(@job))
+        = h(@job.description)
+      .col-sm-2
+        .btn.btn-default.pull-right.dt-reload{ data: { behavior: 'reload' } }
+          %i.fa.fa-refresh
+    %table.table.datatable.jobs-datatable{ style: 'width: 100%', data: { source: "#{jobs_url(format: 'json')}" } }
+      %thead
+        %tr
+          %th Count
+          %th Exception Class
+          %th Exception Messages
+      %tbody
+        - class_name = nil
+        - @exceptions.each do |exception|
+          - exception.messages.each do |message|
+            %tr
+              %th
+                = exception.count if exception.class_name != class_name
+              %th
+                - if exception.class_name != class_name
+                  = link_to(exception.class_name, job_failures_path(@job, error_type: exception.class_name), class: "card callout")
+              %th
+                = message
+          - class_name = exception.class_name

data/app/views/rocket_job_mission_control/jobs/failures/index.html.haml

@@ -8,25 +8,25 @@
       .clearfix
       .list
         - @slice_errors.each do |slice_error|
-          = link_to(job_failures_path(@job, error_type: slice_error['_id']['error_class']), class: "card callout") do
+          = link_to(job_failures_path(@job, error_type: slice_error.class_name), class: "card callout") do
             .inner
               .title
                 .lead
-                  = slice_error['_id']['error_class']
+                  = slice_error.class_name
 
               .description
-                = "Occurrences: #{slice_error['count'].to_i}"
+                = "Occurrences: #{slice_error.count}"
 
   - if @failure_exception
     .col-md-8
       .job-status
         .failures
-          .lead= @failure_exception['class_name']
-          .pagination-buttons.pull-right= render partial: 'pagination', locals: { error_type: @failure_exception['class_name'], pagination: @pagination }
+          .lead= @failure_exception.class_name
+          .pagination-buttons.pull-right= render partial: 'pagination', locals: { error_type: @failure_exception.class_name, pagination: @pagination }
 
         .clearfix
         .message
           %pre
-            %code= @failure_exception['message']
+            %code= @failure_exception.message
         .error
-          %pre.small= @failure_exception['backtrace'].join("\n")
+          %pre.small= @failure_exception.backtrace.join("\n")

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

@@ -4,21 +4,26 @@
       .lead= @job.class.name
 
       .job-state.inline-block
-        .left state
+        .left State
         .right{ class: @job.state.to_s }
           = @job.state
+      - if sub_state = @job['sub_state']
+        .job-state.inline-block
+          .left Batch
+          .right{ class: 'running' }
+            = sub_state
 
       .btn-toolbar.job-actions.pull-right
-        .btn-group
-          - valid_events = @job.aasm.events.collect{ |e| e.name }
-          - if valid_events.include?(:abort)
-            = job_action_link('Abort', rocket_job_mission_control.abort_job_path(@job), :patch)
+        - if @job.respond_to?(:input) && @job.input.failed.count > 0
+          .btn-group
+            = link_to('Show Exceptions', exceptions_job_path(@job), class: 'btn btn-default')
 
-          - if @job.completed? || @job.aborted?
-            = job_action_link('Destroy', rocket_job_mission_control.job_path(@job), :delete)
+        - if @job.scheduled?
+          .btn-group
+            = job_action_link('Run', rocket_job_mission_control.run_now_job_path(@job), :patch)
 
-          - if valid_events.include?(:fail)
-            = job_action_link('Fail', rocket_job_mission_control.fail_job_path(@job), :patch)
+        .btn-group
+          - valid_events = @job.aasm.events.collect{ |e| e.name }
 
           - if valid_events.include?(:pause)
             = job_action_link('Pause', rocket_job_mission_control.pause_job_path(@job), :patch)
@@ -29,8 +34,15 @@
           - if valid_events.include?(:retry)
             = job_action_link('Retry', rocket_job_mission_control.retry_job_path(@job), :patch)
 
-          - if @job.respond_to?(:input) && @job.input.failed_count > 0
-            = link_to('View Errors', job_failures_path(@job), class: 'btn btn-default')
+        .btn-group
+          - if valid_events.include?(:fail)
+            = job_action_link('Fail', rocket_job_mission_control.fail_job_path(@job), :patch)
+
+          - if valid_events.include?(:abort)
+            = job_action_link('Abort', rocket_job_mission_control.abort_job_path(@job), :patch)
+
+          = job_action_link('Destroy', rocket_job_mission_control.job_path(@job), :delete)
+
         - unless @job.completed? || @job.aborted?
           .btn-group
             = link_to "Edit", edit_job_path(@job), class: "btn btn-default"

data/app/views/rocket_job_mission_control/servers/_actions.html.haml

@@ -0,0 +1,9 @@
+- if server.stopping?
+  %p Server is stopping...
+  = link_to "destroy", rocket_job_mission_control.server_path(server), method: :delete, class: 'btn btn-danger'
+-else
+  = link_to "stop", rocket_job_mission_control.stop_server_path(server), method: :patch, class: 'btn btn-danger'
+  - if server.paused?
+    = link_to "resume", rocket_job_mission_control.resume_server_path(server), method: :patch, class: 'btn btn-default'
+  - else
+    = link_to "pause", rocket_job_mission_control.pause_server_path(server), method: :patch, class: 'btn btn-default'

data/app/views/rocket_job_mission_control/servers/_sidebar.html.haml

@@ -0,0 +1,20 @@
+%ul#lg-menu.nav.hidden-xs
+  %li
+    = link_to(servers_path) do
+      %i.fa.fa-list
+      All
+  - RocketJob::Server.aasm.states.map { |s| s.name.to_s }.each do |state|
+    %li{class: state}
+      = link_to("#{state}_servers".to_sym) do
+        %i.fa{class: state_icon(state)}
+        = state.to_s.capitalize!
+        = "(#{server_counts_by_state(state)})"
+/ tiny only nav
+%ul#xs-menu.nav.visible-xs
+  %li
+    = link_to(servers_path) do
+      %i.fa.fa-list
+  - RocketJob::Server.aasm.states.map { |s| s.name.to_s }.each do |state|
+    %li{class: state}
+      = link_to("#{state}_servers".to_sym) do
+        %i.fa{class: state_icon(state)}