midget_jobs 0.1.7 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: badc2c01c840c608fe03888ce13dbcee759869434fd0680a86de4159bd6b4bc0
-  data.tar.gz: 14105778bd73b54cf1235851526b2f3dd1db14839ab035440b1a6e389641a915
+  metadata.gz: 48a48a20bf9bb5ba396ec2f468c15fbcb6ac6d007c52ae8980fede79d7b91ad2
+  data.tar.gz: d2e1a91c7327de1fe53e60143867fe215e913c83d0763f113a3b66c13b6acbfa
 SHA512:
-  metadata.gz: 35600f3e2a92a3a82c7ec24bda01a1048940210dde6e720cb1e1530eb919bb9e24d6b13dcecbc8c089cb502fc73f96666c6ba10cb65723b13c30aa65f0572186
-  data.tar.gz: 843cdf6edf6ed6642268a9b3bfac336ef5ecea2c44b7f9218afde528719ec86d1055b867558935ca8679fa0191f55eb817c6d9abe453502e3b4a64bdeb4a4ba0
+  metadata.gz: '05855d4770375c491f6c887a5a8ed2e37295fb68ef760dff0bbc841547db5cc42fa9c3a33985cddd738c6dc8e505c846efbd8173253555567b91780fb99f8f44'
+  data.tar.gz: 9097c8a42b63a8085858dea385b9a58017451aa019fa6562635cd960729e653dda42b33915ced46e0a5195bd653a243d37df26a6e02b47bb101cf015bb99c148

data/.rubocop.yml

@@ -0,0 +1,67 @@
+# all the cops that are enabled in the default
+# https://github.com/bbatsov/rubocop/blob/master/config/enabled.yml
+# https://github.com/bbatsov/rubocop/blob/master/config/default.yml
+
+require: rubocop-performance
+require: rubocop-rails
+
+AllCops:
+  TargetRubyVersion: 2.6
+  Include:
+    - '**/Rakefile'
+    - '**/config.ru'
+  Exclude:
+    - 'db/**/*'
+    - 'config/**/*'
+    - 'script/**/*'
+    - !ruby/regexp /old_and_unused\.rb$/
+
+Layout/LineLength:
+  Max: 160
+
+Metrics/MethodLength:
+  CountComments: false  # count full line comments?
+  Max: 12
+
+Metrics/AbcSize:
+  Max: 20
+
+Style/AndOr:
+  Enabled: false
+
+Documentation:
+  Enabled: false
+
+Style/ClassAndModuleChildren:
+  # Checks the style of children definitions at classes and modules.
+  #
+  # Basically there are two different styles:
+  #
+  # `nested` - have each child on a separate line
+  #   class Foo
+  #     class Bar
+  #     end
+  #   end
+  #
+  # `compact` - combine definitions as much as possible
+  #   class Foo::Bar
+  #   end
+  #
+  # The compact style is only forced, for classes / modules with one child.
+  EnforcedStyle: nested
+  SupportedStyles:
+    - nested
+    - compact
+  Enabled: false
+
+CaseIndentation:
+  # Valid values are: case, end
+  EnforcedStyle: case
+  IndentOneStep: true
+
+# Prefer `has_?` style for Hash methods
+Style/PreferredHashMethods:
+  EnforcedStyle: verbose
+
+Rails:
+  Enabled: true

data/Gemfile

@@ -12,4 +12,5 @@ group :test do
   gem 'activerecord'
   gem 'pg'
   gem 'activesupport'
+  gem 'simplecov', require: false
 end

data/README.md

@@ -3,6 +3,15 @@
 MidgetJobs is simple implementation of background jobs for [Ruby on Rails](https://rubyonrails.org). I does not meant to be used without it.
 It is connected to [ActiveJob](https://github.com/rails/rails/tree/master/activejob) and [PostgreSQL](https://www.postgresql.org) using its triggers, notifications and listening.
 
+## Update from 0.1.7 to 0.2.0
+There is new column **runner** in **midget_jobs** table!
+It is used to recognise who will run particular job (if there are multiple application over one database)
+
+I added new configuration to Initializer. Add this to your config/initializers/midget_jobs.rb
+```Rails.application.config.x.midget_jobs.runner = Rails.application.class.parent_name```
+
+Please create migration with generator
+```rails generate migration AddRunnerToMidgetJob runner:string:index``` 
 
 ## Installation
 
@@ -21,6 +30,24 @@ Then run
     $ rails generate midget_jobs:install
     
 This generator creates an initializer file at config/initializers and migrations to db/migrate
+
+#### With Puma's multiple workers on production
+
+In file `config/initializers/midget_jobs.rb` disable start with puma:
+
+    ...
+    if Rails.const_defined?('Server')# || $0.include?('puma')
+
+In file `config/puma/production.rb` update `on_worker_boot do` block as:
+
+    ...
+    on_worker_boot do
+      ActiveRecord::Base.establish_connection if defined?(ActiveRecord)
+      Rails.logger.debug 'on_worker_boot starting jobs'
+    
+      MidgetJobs.initialize_workers
+      ...
+    end
       
 ## Usage
 

data/db/migrate/20191022104513_create_midget_jobs.rb

@@ -5,9 +5,11 @@ class CreateMidgetJobs < ActiveRecord::Migration[6.0]
       t.string :queue
       t.jsonb :serialized
       t.datetime :run_at
+      t.string :runner
 
       t.timestamps
     end
     add_index :midget_jobs, :queue
+    add_index :midget_jobs, :runner
   end
 end

data/lib/generators/midget_jobs/templates/create_midget_jobs.rb

@@ -5,9 +5,11 @@ class CreateMidgetJobs < ActiveRecord::Migration[6.0]
       t.string :queue
       t.jsonb :serialized
       t.datetime :run_at
+      t.string :runner
 
       t.timestamps
     end
     add_index :midget_jobs, :queue
+    add_index :midget_jobs, :runner
   end
 end

data/lib/generators/midget_jobs/templates/midget_job_initializer.rb

@@ -1,5 +1,6 @@
 Rails.application.config.active_job.queue_adapter = :midget_job
 Rails.application.config.x.midget_jobs.at_once = 4
+Rails.application.config.x.midget_jobs.runner = Rails.application.class.module_parent_name
 
 if Rails.const_defined?('Server') || $0.include?('puma')
   Rails.application.config.after_initialize do

data/lib/midget_jobs/version.rb

@@ -1,3 +1,3 @@
 module MidgetJobs
-  VERSION = "0.1.7"
+  VERSION = "0.2.5"
 end

data/lib/models/concerns/postgres_notifications_listener.rb

@@ -1,24 +1,44 @@
 # frozen_string_literal: true
 
 module PostgresNotificationsListener
+  TIME_TO_DIE = 3
+  EXCEPTION_TIME = 0.333
+
   def listen_notifications
-    Rails.logger.info "#{self.name} listening_job started"
+    Rails.logger.info "#{name} listening_job started"
     Thread.new do
-      Rails.logger.info "#{self.name} listening_job running on #{self.name.pluralize.underscore}_notices"
-      self.connection.execute "LISTEN #{self.name.pluralize.underscore}_notices"
+      Rails.logger.info "#{name} listening_job running on #{name.pluralize.underscore}_notices"
+      connection.execute "LISTEN #{name.pluralize.underscore}_notices"
       loop do
-        begin
-          Rails.logger.info "#{self.name} listening_job wait_for_notify"
-          self.connection.raw_connection.wait_for_notify do |event, pid, payload|
-            data = JSON.parse payload, symbolize_names: true
-            Rails.logger.info "postgres #{event.inspect}, pid: #{pid.inspect}, data: #{data.inspect}"
-            process_notification(data)
-          end
-        rescue StandardError => error
-          Rails.logger.error "-------------Ex #{self.name} listening_job wait_for_notify #{error}----------------"
-          retry
+        Rails.logger.info "#{name} listening_job wait_for_notify"
+        connection.raw_connection.wait_for_notify do |event, pid, payload|
+          data = JSON.parse payload, symbolize_names: true
+          Rails.logger.info "postgres #{event.inspect}, pid: #{pid.inspect}, data: #{data.inspect}"
+          process_notification(data)
         end
+      rescue PG::ConnectionBad => e
+        measure_exception_severity
+        Rails.logger.error "#{name} listening_job wait_for_notify lost connection #{e.inspect} retry #{exception_counter}th time!"
+        Rails.logger.error 'Reestablish AR connection...'
+        ActiveRecord::Base.connection.verify!
+        sleep 0.1
+        @exception_counter.to_i < EXCEPTION_TIME ? retry : raise(e)
+      rescue StandardError => e
+        measure_exception_severity
+        Rails.logger.error "#{name} listening_job wait_for_notify exception #{e.inspect} retry #{exception_counter}th time!"
+        sleep 0.1
+        @exception_counter.to_i < EXCEPTION_TIME ? retry : raise(e)
       end
     end.abort_on_exception = true
   end
+
+  private
+
+  def measure_exception_severity
+    @exception_counter, @last_exception_time = too_soon? ? [exception_counter.to_i + 1, @last_exception_time] : [0, Time.zone.now]
+  end
+
+  def too_soon?
+    (Time.zone.now - @last_exception_time) < TOO_SOON
+  end
 end

data/lib/models/midget_job.rb

@@ -3,6 +3,8 @@ require 'models/concerns/postgres_notifications_listener'
 class MidgetJob < ActiveRecord::Base
   extend PostgresNotificationsListener
 
+  default_scope { where(runner: Rails.configuration.x.midget_jobs.runner) }
+
   scope :for_processing, -> { where('run_at < ?', Time.current) }
 
   validates :job_id, :queue, :serialized, :run_at, presence: true

data/midget_job.gemspec

@@ -29,6 +29,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "minitest", "~> 5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: midget_jobs
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.5
 platform: ruby
 authors:
 - josefchmel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-19 00:00:00.000000000 Z
+date: 2020-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,16 +28,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -60,6 +60,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile