marty 5.1.4 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 76a0d4a1329fc8a257a905e327c3245dde1e638a
-  data.tar.gz: e918f2b2349a35da28cfdd7e01c0c6710cc5190c
+SHA256:
+  metadata.gz: c09276b6e27aad355d8f9b512b7bdd753f62a19fc669757f6835337c20554f7f
+  data.tar.gz: 91626928a7caa158cc81628978b00d5b1a8b0266c24960c5d6164e06ef0815aa
 SHA512:
-  metadata.gz: ca56ed8fdeb18d1951a6ceeefb7ae3d7b63b7292ac7a577d628153384c333693888feb2669c9ec6ad1074a680ab89a6db9a8212e3540462ee79d6410f937deae
-  data.tar.gz: 36157384d4e25c764cbe1277380603da2e3ef359a07220f2e1572ad7b3a3f2a29810e0917d8a3a9af4e9795e6b3dc45280a523fd0a436f0278b6cd744f44ca03
+  metadata.gz: b5901679d961b8484cdf274566d1f0bf8781364b0ce83a542bf1aee859f72ba6d95e8de2f71430ae5ceb86888c301e45fa0b29444ff770e60a3aed58ba64456c
+  data.tar.gz: 1b849061d5d1293f43e6949820426004f73fe3e6f385e72a18e33bc0bc8d52446dd854069944e77cc0dcf55549b3308930b7c0058aef5e63c36e55a22ca7fdef

data/Gemfile

@@ -9,7 +9,7 @@ group :default do
   gem 'daemons'
   gem 'delayed_job_active_record'
   gem 'pg'
-  gem 'rails'
+  gem 'rails', '>= 5.2.3', '< 6.0.0'
 end
 
 group :default, :cmit do

data/app/components/marty/data_grid_user_view.rb

@@ -17,7 +17,7 @@ module Marty
     end
 
     client_class do |c|
-      c.do_edit_in_form = l(<<~JS)
+      fn = l(<<~JS)
          function(record) {
             var sel = this.getSelectionModel().getSelection()[0];
             var record_id = sel && sel.getId();
@@ -25,6 +25,10 @@ module Marty
             this.server.editGrid({record_id: record_id});
          }
       JS
+
+      # inherited perms don't work right, set both fns to the fancy grid edit
+      c.do_edit_in_form = fn
+      c.do_view_in_form = fn
     end
 
     def default_bbar

data/app/components/marty/grid/client/grid.js

@@ -159,4 +159,22 @@
   clearFilters: function() {
     this.filters.clearFilters();
   },
+
+  netzkeGridSelectedDefaultAction: function(endpoint, confirmation) {
+    var selected = this.getSelectionModel().getSelection().map((r) => r.id)
+
+    if (confirmation) {
+      Ext.Msg.confirm(
+        confirmation,
+        Ext.String.format('Are you sure?'),
+        (btn, value, cfg) => {
+          if (btn == "yes") {
+            this.server[endpoint](selected, () => { this.unmask() })
+          }
+        }
+      );
+    } else {
+      this.server[endpoint](selected, () => { this.unmask() })
+    }
+  }
 }

data/app/components/marty/main_auth_app.rb

@@ -4,6 +4,7 @@ require 'marty/api_log_view'
 require 'marty/config_view'
 require 'marty/data_grid_view'
 require 'marty/schedule_jobs_dashboard'
+require 'marty/schedule_jobs_logs'
 require 'marty/data_grid_user_view'
 require 'marty/event_view'
 require 'marty/import_type_view'
@@ -116,6 +117,7 @@ class Marty::MainAuthApp < Marty::AuthApp
           :bg_stop,
           :bg_restart,
           :schedule_jobs_dashboard,
+          :schedule_jobs_logs,
         ]
       },
     ]
@@ -295,6 +297,14 @@ class Marty::MainAuthApp < Marty::AuthApp
     a.handler = :netzke_load_component_by_action
   end
 
+  action :schedule_jobs_logs do |a|
+    a.text     = "Schedule Job's Logs"
+    a.tooltip  = "Show Scheduled Job's logs"
+    a.icon_cls = 'fa fa-cog glyph'
+    a.disabled = !self.class.has_perm?(:admin)
+    a.handler = :netzke_load_component_by_action
+  end
+
   action :log_view do |a|
     a.text     = 'View Log'
     a.tooltip  = 'View Log'
@@ -394,6 +404,8 @@ class Marty::MainAuthApp < Marty::AuthApp
 
   component :schedule_jobs_dashboard
 
+  component :schedule_jobs_logs
+
   component :config_view
 
   component :data_grid_view

data/app/components/marty/schedule_jobs_logs.rb

@@ -0,0 +1,85 @@
+class Marty::ScheduleJobsLogs < Marty::Grid
+  ACCESSIBLE_BY = [:admin]
+
+  has_marty_permissions(
+    read: ACCESSIBLE_BY,
+    create: ACCESSIBLE_BY,
+    update: ACCESSIBLE_BY,
+    delete: ACCESSIBLE_BY,
+    destroy: ACCESSIBLE_BY,
+    destroy_all: ACCESSIBLE_BY,
+    ignore: ACCESSIBLE_BY,
+    edit_window__edit_form__submit: ACCESSIBLE_BY,
+    add_window__add_form__submit: ACCESSIBLE_BY
+  )
+
+  def configure(c)
+    super
+
+    c.title ||= I18n.t('schedule_jobs_dashboard_view_title', default: "Scheduled Job's Logs")
+    c.model = 'Marty::BackgroundJob::Log'
+    c.paging = :buffered
+    c.editing = :in_form
+    c.multi_select = true
+
+    c.attributes = [
+      :job_class,
+      :status,
+      :error,
+      :created_at
+    ]
+
+    c.store_config.merge!(sorters: [{ property: :id, direction: 'DESC' }])
+  end
+
+  def default_context_menu
+    []
+  end
+
+  def default_bbar
+    [:delete, :destroy_all, :ignore]
+  end
+
+  attribute :job_class do |c|
+    c.width = 400
+    c.read_only = true
+  end
+
+  attribute :status do |c|
+    c.read_only = true
+  end
+
+  attribute :error do |c|
+    c.width = 800
+    c.read_only = true
+    c.getter = ->(record) { record.error.to_json }
+  end
+
+  action :destroy_all do |a|
+    a.text     = 'Delete all'
+    a.tooltip  = 'Delete all logs'
+    a.icon_cls = 'fa fa-trash glyph'
+  end
+
+  action :ignore do |a|
+    a.text     = 'Ignore in diag'
+    a.tooltip  = 'Ignore in diag'
+    a.icon_cls = 'fa fa-trash glyph'
+  end
+
+  endpoint :destroy_all do
+    Marty::BackgroundJob::Log.delete_all
+    client.reload
+  end
+
+  endpoint :ignore do |ids|
+    Marty::BackgroundJob::Log.
+      where(id: ids).
+      where(status: :failure).
+      each { |record| record.update(status: :failure_ignore) }
+
+    client.reload
+  end
+end
+
+ScheduleJobsLogs = Marty::ScheduleJobsLogs

data/app/components/marty/schedule_jobs_logs/client/schedule_jobs_logs.js

@@ -0,0 +1,15 @@
+{
+    netzkeOnDestroyAll: function(params) {
+      Ext.Msg.confirm(
+        'Delete all',
+        Ext.String.format('Are you sure?'),
+        (btn, value, cfg) => {
+          if (btn == "yes") {
+            this.mask('Deleting...');
+            this.server.destroyAll(() => { this.unmask()});
+          }
+        });
+      },
+
+    netzkeOnIgnore: function(_) { return this.netzkeGridSelectedDefaultAction('ignore') }
+}

data/app/jobs/marty/cron_job.rb

@@ -1,4 +1,34 @@
 class Marty::CronJob < ActiveJob::Base
+  around_perform do |_job, block|
+    begin
+      block.call
+      log_success
+    rescue StandardError => e
+      log_failure(e)
+      raise e
+    end
+  end
+
+  def log_failure(exception)
+    error = {
+      message: exception.message,
+      backtrace: exception.backtrace
+    }
+
+    ::Marty::BackgroundJob::Log.create!(
+      job_class: self.class.name,
+      status: :failure,
+      error: error
+    )
+  end
+
+  def log_success
+    ::Marty::BackgroundJob::Log.create!(
+      job_class: self.class.name,
+      status: :success
+    )
+  end
+
   class << self
     def schedule
       return reschedule if scheduled?

data/app/models/marty/background_job/log.rb

@@ -0,0 +1,12 @@
+module Marty
+  module BackgroundJob
+    class Log < Marty::Base
+      self.table_name = 'marty_background_job_logs'
+
+      validates :job_class, :status, presence: true
+
+      ALL_STATUSES = %w[success failure failure_ignore].freeze
+      enum status: ALL_STATUSES.zip(ALL_STATUSES).to_h
+    end
+  end
+end

data/db/migrate/511_create_marty_delayed_job_logs.rb

@@ -0,0 +1,13 @@
+class CreateMartyDelayedJobLogs < ActiveRecord::Migration[5.1]
+  def change
+    create_table :marty_background_job_logs do |t|
+      t.string :job_class, null: false
+      t.string :status, null: false
+      t.jsonb :error
+
+      t.timestamps
+    end
+
+    add_index :marty_background_job_logs, :job_class
+  end
+end

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = '5.1.4'
+  VERSION = '5.2.0'
 end

data/other/marty/diagnostic/database.rb

@@ -20,8 +20,9 @@ module Marty::Diagnostic::Database
   end
 
   def self.db_schema
-    current = ActiveRecord::Migration.current_version
+    current = ActiveRecord::Migrator.current_version
     raise "Migration is needed.\nCurrent Version: #{current}" if
+      Rails.version >= '5.2.0' &&
       ActiveRecord::Base.connection.migration_context.needs_migration?
 
     current.to_s

data/other/marty/diagnostic/scheduled_jobs.rb

@@ -0,0 +1,25 @@
+module Marty::Diagnostic; class ScheduledJobs < Base
+  self.aggregatable = false
+
+  diagnostic_fn do
+    logs = ::Marty::BackgroundJob::Log.
+      order(job_class: :asc, status: :desc, id: :desc).
+      select('DISTINCT ON(job_class, status) *').
+      where.not(status: :failure_ignore).
+      first(1000)
+
+    failed_total = ::Marty::BackgroundJob::Log.where(status: :failure).count
+
+    result = logs.each_with_object({}) do |log, hash|
+      message = "Status: #{log.status}, last_run: #{log.created_at}"
+      message = "#{message}, error: #{log.error}" if log.failure?
+      hash[log.job_class] = log.success? ? message : error(message)
+    end
+
+    result['Failures total'] = 0
+    result['Failures total'] = error(failed_total) if failed_total != 0
+
+    result
+  end
+end
+end

data/spec/dummy/public/images/icons

@@ -1 +1 @@
-spec/dummy/public/images/../extjs/icons/
+../extjs/icons/

data/spec/dummy/spec/features/javascripts

@@ -1 +1 @@
-spec/dummy/spec/features/../../../features/javascripts/
+../../../features/javascripts/

data/spec/features/schedule_jobs_logs_spec.rb

@@ -0,0 +1,102 @@
+require 'spec_helper'
+
+feature 'Schedule Jobs Logs', js: true do
+  before do
+    populate_test_users
+  end
+
+  context 'as dev' do
+    before do
+      log_in_as('dev1')
+      wait_for_ajax
+      press('System')
+      press('Background Jobs')
+      press("Schedule Job's Logs")
+      wait_for_ajax
+    end
+
+    it 'access denied' do
+      expect(page).to_not have_content "Schedule Job's Logs"
+    end
+  end
+
+  context 'as admin' do
+    let(:grid_view) { netzke_find('schedule_jobs_logs') }
+
+    let!(:create_logs) do
+      Marty::BackgroundJob::Log.create!(
+        job_class: 'TestJob2',
+        status: :success,
+        created_at: 3.minutes.ago
+      )
+
+      Marty::BackgroundJob::Log.create!(
+        job_class: 'TestJob2',
+        status: :failure,
+        error: { message: 'Test error message', backtrace: '' },
+        created_at: 2.minutes.ago
+      )
+
+      Marty::BackgroundJob::Log.create!(
+        job_class: 'Another Test Job',
+        status: :success,
+        created_at: 1.minute.ago
+      )
+    end
+
+    before do
+      log_in_as('admin1')
+      wait_for_ajax
+      press('System')
+      press('Background Jobs')
+      press("Schedule Job's Logs")
+
+      wait_for_ajax
+
+      expect(page).to have_content "Scheduled Job's Logs"
+    end
+
+    it 'shows logs' do
+      class_names = grid_view.get_col_vals('job_class', 3, 0)
+
+      expect(class_names.uniq).to eq ['Another Test Job', 'TestJob2']
+
+      statuses = grid_view.get_col_vals('status', 3, 0)
+      expect(statuses).to eq ['success', 'failure', 'success']
+    end
+
+    it 'deletes log' do
+      find('.x-grid-item', text: 'Another Test Job').click
+      press 'Delete'
+      press 'Yes'
+
+      wait_for_ajax
+
+      class_names = grid_view.get_col_vals('job_class', 2, 0)
+      expect(class_names.uniq).to eq ['TestJob2']
+    end
+
+    it 'deletes all logs' do
+      press 'Delete all'
+      press 'Yes'
+
+      wait_for_ajax
+
+      expect(grid_view.row_count).to eq 0
+      expect(Marty::BackgroundJob::Log.count).to eq 0
+    end
+
+    it 'marks as ignored in diags' do
+      expect(Marty::BackgroundJob::Log.failure_ignore.count).to eq 0
+      find('.x-grid-item', text: 'Test error').click
+      press 'Ignore in diag'
+      press 'Yes'
+
+      wait_for_ajax
+
+      statuses = grid_view.get_col_vals('status', 3, 0)
+      expect(statuses).to eq ['success', 'failure_ignore', 'success']
+      expect(Marty::BackgroundJob::Log.failure_ignore.count).to eq 1
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 5.1.4
+  version: 5.2.0
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-13 00:00:00.000000000 Z
+date: 2019-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sigv4
@@ -293,6 +293,8 @@ files:
 - app/components/marty/reporting/client/reporting.js
 - app/components/marty/schedule_jobs_dashboard.rb
 - app/components/marty/schedule_jobs_dashboard/client/schedule_jobs_dashboard.js
+- app/components/marty/schedule_jobs_logs.rb
+- app/components/marty/schedule_jobs_logs/client/schedule_jobs_logs.js
 - app/components/marty/script_form.rb
 - app/components/marty/script_form/client/script_form.js
 - app/components/marty/script_grid.rb
@@ -319,6 +321,7 @@ files:
 - app/models/marty/api_auth.rb
 - app/models/marty/api_config.rb
 - app/models/marty/background_job.rb
+- app/models/marty/background_job/log.rb
 - app/models/marty/background_job/schedule.rb
 - app/models/marty/base.rb
 - app/models/marty/base_rule.rb
@@ -412,6 +415,7 @@ files:
 - db/migrate/507_migrate_marty_roles_to_enum.rb
 - db/migrate/508_add_not_to_data_grids_tables.rb
 - db/migrate/509_update_dg_plpgsql_v1_fns.rb
+- db/migrate/511_create_marty_delayed_job_logs.rb
 - db/seeds.rb
 - db/sql/lookup_grid_distinct_v1.sql
 - db/sql/query_grid_dir_v1.sql
@@ -476,6 +480,7 @@ files:
 - other/marty/diagnostic/packer.rb
 - other/marty/diagnostic/reporter.rb
 - other/marty/diagnostic/request.rb
+- other/marty/diagnostic/scheduled_jobs.rb
 - other/marty/diagnostic/version.rb
 - script/rails
 - spec/controllers/application_controller_spec.rb
@@ -1600,6 +1605,7 @@ files:
 - spec/features/reporting_spec.rb
 - spec/features/rule_spec.rb
 - spec/features/schedule_jobs_dashboard_spec.rb
+- spec/features/schedule_jobs_logs_spec.rb
 - spec/features/scripting_spec.rb
 - spec/features/scripting_test_spec.rb
 - spec/features/user_view_spec.rb
@@ -1694,8 +1700,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A framework for working with versioned data