skiplock 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ee6a8ff68af1a1029a26db98867457a798c4fb6aacf0a2a2816efd3ef2b977b
-  data.tar.gz: 2c75fb21c79346f4525b8634b28fb326505acb7ab61795fe7d291c3faa75244f
+  metadata.gz: 7a975a3bb22318c6203edd59428a93d6a4abfa5ea1382f35abd774760467dc23
+  data.tar.gz: 79b787d23af0db0188aebf1b0361649d906d5f0cca4488d7cfcb3f61927d4781
 SHA512:
-  metadata.gz: c34fa2c27f9fc8bcfbe6c54a30de8645418dfe7c13e8db9ea8c30352f75abd9ab9b04d1a294aea7f2a9f33772d9cc5ed96839bd63d1eacbda17749758b4755b2
-  data.tar.gz: 03cdbef1a70a64fb188258dc44049f9323f53cb9c2e64f8a79a9c8a4a17ca8aea2e7ca718ceb3bc78cc08fd61d6dbd5c3f104f653a9645132ef31f73d22883da
+  metadata.gz: 407469700b1fab6c4ea702b83df0571fd46322ad32c8c8fe8ffc0269e5e93cd9f774b8bd4658021320732ca4de6d7609a64430cbc26bddc14c9f14cf184f92e3
+  data.tar.gz: 69a5fe7f5c88f21585a4b581d34f44183cb12f25bc0df6e7982497fb63c088316a251cc55c4e712b3cad799ec9aa758c8045d911fbeda393267ed39bc694e9a5

data/README.md

@@ -68,48 +68,48 @@ The library is quite small compared to other PostgreSQL job queues (eg. *delay_j
     - **max_retries** (*integer*): sets the maximum attempt a job will be retrying before it is marked expired (see Retry System for more details)
     - **notification** (*enumeration*): sets the library to be used for notifying errors and exceptions (`auto, airbrake, bugsnag, exception_notification, false`)
     - **purge_completion** (*boolean*): when set to **true** will delete jobs after they were completed successfully; if set to **false** then the completed jobs should be purged periodically to maximize performance (eg. clean up old jobs after 3 months)
-    - **queues** (*hash*): defines the set of queues with priorites; lower priority takes precedence
+    - **queues** (*hash*): defines the set of queues with priorities; lower priority takes precedence
     - **workers** (*integer*) sets the maximum number of processes when running in standalone mode using the `skiplock` executable; setting this to **0** will enable **async mode**
     
     #### Async mode
     When **workers** is set to **0** then the jobs will be performed in the web server process using separate threads.  If using multi-worker cluster mode web server like Puma, then it should be configured as below:
     ```ruby
     # config/puma.rb
-    before_fork do
-      # ...
-      Skiplock::Manager.shutdown
+    # ...
+    on_worker_fork do |worker_index|
+      Skiplock::Manager.shutdown if worker_index == 1
     end
 
     after_worker_fork do |worker_index|
       # restarts skiplock after all Puma workers have been started
-      # Skiplock runs in Puma master's process only
-      Skiplock::Manager.start if (worker_index + 1) == @options[:workers]
+      Skiplock::Manager.start(restart: true) if defined?(Skiplock) && worker_index + 1 == @options[:workers]
     end
     ```
-
 ## Usage
-
-- Inside the Rails application, queue your job:
+Inside the Rails application:
+- queue your job
     ```ruby
     MyJob.perform_later
     ```
-- Skiplock supports all ActiveJob features:
+- Skiplock supports all ActiveJob features
     ```ruby
     MyJob.set(queue: 'my_queue', wait: 5.minutes, priority: 10).perform_later(1,2,3)
     ```
-- Outside of Rails application, queue the jobs by inserting the job records directly to the database table eg:
+Outside the Rails application:
+- queue the jobs by inserting the job records directly to the database table
     ```sql
     INSERT INTO skiplock.jobs(job_class) VALUES ('MyJob');
     ```
-- Or with scheduling, priority, queue and arguments:
+- with scheduling, priority, queue and arguments
     ```sql
-    INSERT INTO skiplock.jobs(job_class,queue_name,priority,scheduled_at,data) VALUES ('MyJob','my_queue',10,NOW()+INTERVAL '5 min','{"arguments":[1,2,3]}');
+    INSERT INTO skiplock.jobs(job_class, queue_name, priority, scheduled_at, data)
+      VALUES ('MyJob', 'my_queue', 10, NOW() + INTERVAL '5 min', '{"arguments":[1,2,3]}');
     ```
-## Queues priority vs Job priority
-*Why do queues have priorities when jobs already have priorities?*
+## Queue priority vs Job priority
+*Why do queues use priorities when jobs already have priorities?*
 - Jobs are only prioritized with other jobs from the same queue
 - Queues, on the other hand, are prioritized with other queues
-- Rails has built-in queues that dispatches jobs without priorities (eg. Mail Delivery will queue as **mailers** with no priority)
+- Rails has built-in queues that dispatch jobs without priorities (eg. Mail Delivery will queue as **mailers** with no priority)
 
 ## Cron system
 `Skiplock` provides the capability to setup cron jobs for running tasks periodically.  It fully supports the cron syntax to specify the frequency of the jobs.  To setup a cron job, simply assign a valid cron schedule to the constant `CRON` for the Job Class.
@@ -131,7 +131,7 @@ The library is quite small compared to other PostgreSQL job queues (eg. *delay_j
 - to remove the cron schedule from the job, simply comment out the constant definition or delete the line then re-deploy the application. At startup, the cron jobs that were undefined will be removed automatically
 
 ## Retry system
-`Skiplock` fully supports ActiveJob built-in retry system.  It also has its own retry system for fallback.  To use ActiveJob retry system, define the rescue blocks per ActiveJob's documentation.
+`Skiplock` fully supports ActiveJob built-in retry system.  It also has its own retry system for fallback.  To use ActiveJob retry system, define the `retry_on` block per ActiveJob's documentation.
 - configures `MyJob` to retry at maximum 20 attempts on StandardError with fixed delay of 5 seconds
     ```ruby
     class MyJob < ActiveJob::Base
@@ -147,20 +147,21 @@ The library is quite small compared to other PostgreSQL job queues (eg. *delay_j
     # ...
     end
     ```
-Once the retry attempt limit configured in ActiveJob has been reached, the control will be passed back to `skiplock` to be marked as an expired job.
+If the retry attempt limit configured in ActiveJob has been reached, then the control will be passed back to `skiplock` to be marked as an expired job.
 
-If the rescue blocks are not defined, then the built-in retry system of `skiplock` will kick in automatically.  The retrying schedule is using an exponential formula (5 + 2**attempt).  The `skiplock` configuration `max_retries` determines the the limit of attempts before the failing job is marked as expired.  The maximum retry limit can be set as high as 20; this allows up to 12 days of retrying before the job is marked as expired.
+If the `retry_on` block is not defined, then the built-in retry system of `skiplock` will kick in automatically.  The retrying schedule is using an exponential formula (5 + 2**attempt).  The `skiplock` configuration `max_retries` determines the the limit of attempts before the failing job is marked as expired.  The maximum retry limit can be set as high as 20; this allows up to 12 days of retrying before the job is marked as expired.
 
 ## Notification system
-`Skiplock` can use existing exception notification library to notify errors and exceptions.  It supports `airbrake`, `bugsnag`, and `exception_notification`.  A customized function can also be called whenever an exception occurs; this can be configured in an initializer as below:
+`Skiplock` can use existing exception notification library to notify errors and exceptions.  It supports `airbrake`, `bugsnag`, and `exception_notification` as shown in the **Configuration** section above.  Custom function can also be called whenever an exception occurs; it can be configured in an initializer like below:
 ```ruby
   # config/initializers/skiplock.rb
-  Skiplock.on_error = -> (ex, previous = nil) do
+  Skiplock.on_error do |ex, previous|
     if ex.backtrace != previous.try(:backtrace)
       # sends custom email on new exceptions only
       # the same repeated exceptions will only be sent once to avoid SPAM
     end
   end
+  # supports multiple on_error callbacks
 ```
 
 ## Contributing

data/bin/skiplock

@@ -1,3 +1,26 @@
 #!/usr/bin/env ruby
+require 'optparse'
+options = {}
+begin
+  op = OptionParser.new do |opts|
+    opts.banner = "Usage: #{File.basename($0)} [options]"
+    opts.on('-e', '--environment STRING', String, 'Rails environment')
+    opts.on('-l', '--logging STRING', String, 'Possible values: true, false, timestamp')
+    opts.on('-r', '--max_retries NUM', Integer, 'Number of maxixum retries')
+    opts.on('-t', '--max_threads NUM', Integer, 'Number of maximum threads')
+    opts.on('-T', '--min_threads NUM', Integer, 'Number of minimum threads')
+    opts.on('-w', '--workers NUM', Integer, 'Number of workers')
+    opts.on_tail('-h', '--help', 'Show this message') do
+      exit
+    end
+  end
+  op.parse!(into: options)
+rescue Exception => e
+  puts "\n#{e.message}\n\n" unless e.is_a?(SystemExit)
+  puts op
+  exit
+end
+env = options.delete(:environment)
+ENV['RAILS_ENV'] = env if env
 require File.expand_path("config/environment.rb")
-Skiplock::Manager.start(standalone: true)
+Skiplock::Manager.start(standalone: true, **options)

data/lib/active_job/queue_adapters/skiplock_adapter.rb

@@ -6,7 +6,7 @@ module ActiveJob
       end
 
       def enqueue(job)
-        enqueue_at(job, nil)
+        Skiplock::Job.enqueue(job)
       end
 
       def enqueue_at(job, timestamp)

data/lib/generators/skiplock/templates/migration.rb.erb

@@ -1,6 +1,14 @@
 class CreateSkiplockSchema < ActiveRecord::Migration<%= "[#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}]" %>
   def up
     execute 'CREATE SCHEMA skiplock'
+    create_table 'skiplock.counters', id: :uuid do |t|
+      t.integer   :completions, null: false, default: 0
+      t.integer   :dispatches, null: false, default: 0
+      t.integer   :expiries, null: false, default: 0
+      t.integer   :failures, null: false, default: 0
+      t.integer   :retries, null: false, default: 0
+      t.date      :day, null: false, index: { unique: true }
+    end
     create_table 'skiplock.jobs', id: :uuid do |t|
       t.uuid      :worker_id, index: true
       t.string    :job_class, null: false
@@ -31,10 +39,25 @@ class CreateSkiplockSchema < ActiveRecord::Migration<%= "[#{ActiveRecord::VERSIO
         DECLARE
           record RECORD;
         BEGIN
+          record = NEW;
           IF (TG_OP = 'DELETE') THEN
             record = OLD;
-          ELSE
-            record = NEW;
+            IF (record.finished_at IS NOT NULL OR record.expired_at IS NOT NULL) THEN
+              RETURN NULL;
+            END IF;
+            INSERT INTO skiplock.counters (day,completions) VALUES (NOW(),1) ON CONFLICT (day) DO UPDATE SET completions = skiplock.counters.completions + 1;
+          ELSIF (record.running = TRUE) THEN
+            IF (record.executions IS NULL) THEN
+              INSERT INTO skiplock.counters (day,dispatches) VALUES (NOW(),1) ON CONFLICT (day) DO UPDATE SET dispatches = skiplock.counters.dispatches + 1;
+            ELSE
+              INSERT INTO skiplock.counters (day,retries) VALUES (NOW(),1) ON CONFLICT (day) DO UPDATE SET retries = skiplock.counters.retries + 1;
+            END IF;
+          ELSIF (record.finished_at IS NOT NULL) THEN
+            INSERT INTO skiplock.counters (day,completions) VALUES (NOW(),1) ON CONFLICT (day) DO UPDATE SET completions = skiplock.counters.completions + 1;
+          ELSIF (record.expired_at IS NOT NULL) THEN
+            INSERT INTO skiplock.counters (day,expiries) VALUES (NOW(),1) ON CONFLICT (day) DO UPDATE SET expiries = skiplock.counters.expiries + 1;
+          ELSIF (record.executions IS NOT NULL AND record.scheduled_at IS NOT NULL) THEN
+            INSERT INTO skiplock.counters (day,failures) VALUES (NOW(),1) ON CONFLICT (day) DO UPDATE SET failures = skiplock.counters.failures + 1;
           END IF;
           PERFORM pg_notify('skiplock::jobs', CONCAT(TG_OP,',',record.id::TEXT,',',record.worker_id::TEXT,',',record.queue_name,',',record.running::TEXT,',',CAST(EXTRACT(EPOCH FROM record.expired_at) AS FLOAT)::TEXT,',',CAST(EXTRACT(EPOCH FROM record.finished_at) AS FLOAT)::TEXT,',',CAST(EXTRACT(EPOCH FROM CASE WHEN record.scheduled_at IS NULL THEN record.updated_at ELSE record.scheduled_at END) AS FLOAT)::TEXT));
           RETURN NULL;

data/lib/skiplock.rb

@@ -1,10 +1,11 @@
 require 'active_job'
 require 'active_job/queue_adapters/skiplock_adapter'
 require 'active_record'
+require 'skiplock/counter'
 require 'skiplock/cron'
 require 'skiplock/dispatcher'
-require 'skiplock/manager'
 require 'skiplock/job'
+require 'skiplock/manager'
 require 'skiplock/worker'
 require 'skiplock/version'
 
@@ -22,5 +23,13 @@ module Skiplock
     },
     'workers' => 0
   }
-  mattr_accessor :on_error
+  mattr_reader :on_errors, default: []
+
+  def self.on_error(&block)
+    @@on_errors << block
+  end
+
+  def self.table_name_prefix
+    'skiplock.'
+  end
 end

data/lib/skiplock/counter.rb

@@ -0,0 +1,4 @@
+module Skiplock
+  class Counter < ActiveRecord::Base
+  end
+end

data/lib/skiplock/dispatcher.rb

@@ -16,121 +16,120 @@ module Skiplock
     
     def run
       Thread.new do
-        sleep(1) while @running && !Rails.application.initialized?
-        Process.setproctitle("skiplock-#{@master ? 'master[0]' : 'worker[' + @worker_num.to_s + ']'}") if Settings['workers'] > 0
-        ActiveRecord::Base.connection_pool.with_connection do |connection|
-          connection.exec_query('LISTEN "skiplock::jobs"')
-          hostname = `hostname -f`.strip
-          @worker = Worker.create!(pid: Process.pid, ppid: (@master ? nil : Process.ppid), capacity: Settings['max_threads'], hostname: hostname)
-          if @master
-            connection.exec_query('LISTEN "skiplock::workers"')
-            if File.exists?('tmp/cache/skiplock')
-              # get performed jobs that could not sync with database
-              job_ids = File.read('tmp/cache/skiplock').split("\n")
-              if Settings['purge_completion']
-                Job.where(id: job_ids).delete_all
-              else
-                Job.where(id: job_ids).update_all(running: false, finished_at: File.mtime('tmp/cache/skiplock'), updated_at: Time.now)
+        Rails.application.reloader.wrap do
+          sleep(1) while @running && !Rails.application.initialized?
+          Rails.application.eager_load!
+          Process.setproctitle("skiplock-#{@master ? 'master[0]' : 'worker[' + @worker_num.to_s + ']'}") if Settings['workers'] > 0 && !Rails.env.development?
+          ActiveRecord::Base.connection_pool.with_connection do |connection|
+            connection.exec_query('LISTEN "skiplock::jobs"')
+            hostname = `hostname -f`.strip
+            @worker = Worker.create!(pid: Process.pid, ppid: (@master ? nil : Process.ppid), capacity: Settings['max_threads'], hostname: hostname)
+            if @master
+              connection.exec_query('LISTEN "skiplock::workers"')
+              Dir.mkdir('tmp/skiplock') unless Dir.exist?('tmp/skiplock')
+              check_sync_errors
+              # get dead worker ids
+              dead_worker_ids = Worker.where(hostname: hostname).where.not(pid: @worker_pids).ids
+              if dead_worker_ids.count > 0
+                # reset orphaned jobs of the dead worker ids for retry
+                Job.where(running: true).where(worker_id: dead_worker_ids).update_all(running: false, worker_id: nil)
+                # remove dead workers
+                Worker.where(id: dead_worker_ids).delete_all
               end
-              File.delete('tmp/cache/skiplock')
+              # reset retries schedules on startup
+              Job.where('scheduled_at > NOW() AND executions IS NOT NULL AND expired_at IS NULL AND finished_at IS NULL').update_all(scheduled_at: nil, updated_at: Time.now)
+              Cron.setup
             end
-            # get dead worker ids
-            dead_worker_ids = Worker.where(hostname: hostname).where.not(pid: @worker_pids).ids
-            if dead_worker_ids.count > 0
-              # reset orphaned jobs of the dead worker ids for retry
-              Job.where(running: true).where(worker_id: dead_worker_ids).update_all(running: false, worker_id: nil)
-              # remove dead workers
-              Worker.where(id: dead_worker_ids).delete_all
-            end
-            # reset retries schedules on startup
-            Job.where('scheduled_at > NOW() AND executions IS NOT NULL AND expired_at IS NULL AND finished_at IS NULL').update_all(scheduled_at: nil, updated_at: Time.now)
-            Cron.setup
-          end
-          error = false
-          while @running
-            begin
-              if error
-                unless connection.active?
-                  connection.reconnect!
-                  sleep(0.5)
-                  connection.exec_query('LISTEN "skiplock::jobs"')
-                  connection.exec_query('LISTEN "skiplock::workers"') if @master
-                  @next_schedule_at = Time.now.to_f
-                end
-                error = false
-              end
-              if Job::Errors.keys.count > 0
-                completed_ids = Job::Errors.keys.map { |k| k if Job::Errors[k] }.compact
-                if Settings['purge_completion'] && completed_ids.count > 0
-                  Job.where(id: completed_ids, running: true).delete_all
-                elsif completed_ids.count > 0
-                  Job.where(id: completed_ids, running: true).update_all(running: false, finished_at: Time.now, updated_at: Time.now)
-                end
-                orphaned_ids = Job::Errors.keys.map { |k| k unless Job::Errors[k] }.compact
-                Job.where(id: orphaned_ids, running: true).update_all(running: false, worker_id: nil, scheduled_at: (Time.now + 10), updated_at: Time.now) if orphaned_ids.count > 0
-                Job::Errors.clear
-              end
-              notifications = { 'skiplock::jobs' => [], 'skiplock::workers' => [] }
-              connection.raw_connection.wait_for_notify(0.1) do |channel, pid, payload|
-                notifications[channel] << payload if payload
-                loop do
-                  payload = connection.raw_connection.notifies
-                  break unless @running && payload
-                  notifications[payload[:relname]] << payload[:extra]
-                end
-                notifications['skiplock::jobs'].each do |n|
-                  op, id, worker_id, queue_name, running, expired_at, finished_at, scheduled_at = n.split(',')
-                  if @master
-                    # TODO: report job status to action cable
-                  end
-                  next if op == 'DELETE' || running == 'true' || expired_at.to_f > 0 || finished_at.to_f > 0  || scheduled_at.to_f < @last_dispatch_at
-                  if scheduled_at.to_f < Time.now.to_f
+            error = false
+            while @running
+              begin
+                if error
+                  unless connection.active?
+                    connection.reconnect!
+                    sleep(0.5)
+                    connection.exec_query('LISTEN "skiplock::jobs"')
+                    connection.exec_query('LISTEN "skiplock::workers"') if @master
                     @next_schedule_at = Time.now.to_f
-                  elsif scheduled_at.to_f < @next_schedule_at
-                    @next_schedule_at = scheduled_at.to_f
                   end
+                  check_sync_errors
+                  error = false
                 end
-                if @master
-                  # TODO: report worker status to action cable
-                  notifications['skiplock::workers'].each do |n|
+                notifications = { 'skiplock::jobs' => [], 'skiplock::workers' => [] }
+                connection.raw_connection.wait_for_notify(0.1) do |channel, pid, payload|
+                  notifications[channel] << payload if payload
+                  loop do
+                    payload = connection.raw_connection.notifies
+                    break unless @running && payload
+                    notifications[payload[:relname]] << payload[:extra]
+                  end
+                  notifications['skiplock::jobs'].each do |n|
+                    op, id, worker_id, queue_name, running, expired_at, finished_at, scheduled_at = n.split(',')
+                    if @master
+                      # TODO: report job status to action cable
+                    end
+                    next if op == 'DELETE' || running == 'true' || expired_at.to_f > 0 || finished_at.to_f > 0  || scheduled_at.to_f < @last_dispatch_at
+                    if scheduled_at.to_f < Time.now.to_f
+                      @next_schedule_at = Time.now.to_f
+                    elsif scheduled_at.to_f < @next_schedule_at
+                      @next_schedule_at = scheduled_at.to_f
+                    end
+                  end
+                  if @master
+                    # TODO: report worker status to action cable
+                    notifications['skiplock::workers'].each do |n|
+                    end
                   end
                 end
+                if Time.now.to_f >= @next_schedule_at && @executor.remaining_capacity > 0
+                  @executor.post { do_work }
+                end
+              rescue Exception => ex
+                # most likely error with database connection
+                STDERR.puts ex.message
+                STDERR.puts ex.backtrace
+                Skiplock.on_errors.each { |p| p.call(ex, @last_exception) }
+                error = true
+                t = Time.now
+                while @running
+                  sleep(0.5)
+                  break if Time.now - t > 5
+                end
+                @last_exception = ex
               end
-              if Time.now.to_f >= @next_schedule_at && @executor.remaining_capacity > 0
-                @executor.post { do_work }
-              end
-            rescue Exception => ex
-              # most likely error with database connection
-              STDERR.puts ex.message
-              STDERR.puts ex.backtrace
-              Skiplock.on_error.call(ex, @last_exception) if Skiplock.on_error.is_a?(Proc)
-              error = true
-              t = Time.now
-              while @running
-                sleep(0.5)
-                break if Time.now - t > 5
-              end
-              @last_exception = ex
+              sleep(0.2)
             end
-            sleep(0.2)
+            connection.exec_query('UNLISTEN *')
+            @executor.shutdown
+            @executor.wait_for_termination if @wait
+            @worker.delete if @worker
           end
-          connection.exec_query('UNLISTEN *')
         end
       end
     end
 
     def shutdown(wait: true)
       @running = false
-      @executor.shutdown
-      @executor.wait_for_termination if wait
-      @worker.delete if @worker
+      @wait = wait
     end
 
     private
 
+    def check_sync_errors
+      # get performed jobs that could not sync with database
+      Dir.glob('tmp/skiplock/*').each do |f|
+        job_from_db = Job.find_by(id: File.basename(f), running: true)
+        disposed = true
+        if job_from_db
+          job, ex = YAML.load_file(f) rescue nil
+          disposed = job.dispose(ex)
+        end
+        File.delete(f) if disposed
+      end
+    end
+
     def do_work
       while @running
-        @last_dispatch_at = Time.now.to_f
+        @last_dispatch_at = Time.now.to_f - 1  # 1 second allowance for timedrift
         result = Job.dispatch(queues_order_query: @queues_order_query, worker_id: @worker.id)
         next if result.is_a?(Job)
         @next_schedule_at = result if result.is_a?(Float)
@@ -139,7 +138,7 @@ module Skiplock
     rescue Exception => ex
       STDERR.puts ex.message
       STDERR.puts ex.backtrace
-      Skiplock.on_error.call(ex, @last_exception) if Skiplock.on_error.is_a?(Proc)
+      Skiplock.on_errors.each { |p| p.call(ex, @last_exception) }
       @last_exception = ex
     end
   end

data/lib/skiplock/job.rb

@@ -1,18 +1,13 @@
 module Skiplock
   class Job < ActiveRecord::Base
-    self.table_name = 'skiplock.jobs'
-    Errors = Concurrent::Map.new
-
-    # Return: Skiplock::Job if it was executed; otherwise returns the next Job's schedule time in FLOAT
     def self.dispatch(queues_order_query: nil, worker_id: nil)
-      performed = false
       self.connection.exec_query('BEGIN')
       job = self.find_by_sql("SELECT id, scheduled_at FROM #{self.table_name} WHERE running = FALSE AND expired_at IS NULL AND finished_at IS NULL ORDER BY scheduled_at ASC NULLS FIRST,#{queues_order_query ? ' CASE ' + queues_order_query + ' ELSE NULL END ASC NULLS LAST,' : ''} priority ASC NULLS LAST, created_at ASC FOR UPDATE SKIP LOCKED LIMIT 1").first
       if job.nil? || job.scheduled_at.to_f > Time.now.to_f
         self.connection.exec_query('END')
         return (job ? job.scheduled_at.to_f : Float::INFINITY)
       end
-      job = Skiplock::Job.find_by_sql("UPDATE #{self.table_name} SET running = TRUE, worker_id = #{self.connection.quote(worker_id)} WHERE id = '#{job.id}' RETURNING *").first
+      job = Skiplock::Job.find_by_sql("UPDATE #{self.table_name} SET running = TRUE, worker_id = #{self.connection.quote(worker_id)}, updated_at = NOW() WHERE id = '#{job.id}' RETURNING *").first
       self.connection.exec_query('END')
       job.data ||= {}
       job.exception_executions ||= {}
@@ -23,51 +18,15 @@ module Skiplock
         ActiveJob::Base.execute(job_data)
       rescue Exception => ex
       end
-      performed = true
-      job.running = false
-      if ex
-        job.exception_executions["[#{ex.class.name}]"] = (job.exception_executions["[#{ex.class.name}]"] || 0) + 1 unless job.exception_executions.key?('activejob_retry')
-        if job.executions >= Settings['max_retries'] || job.exception_executions.key?('activejob_retry')
-          job.expired_at = Time.now
-          job.save!
-        else
-          job.scheduled_at = Time.now + (5 * 2**job.executions)
-          job.save!
-        end
-        Skiplock.on_error.call(ex) if Skiplock.on_error.is_a?(Proc) && (job.executions % 3 == 1)
-      elsif job.exception_executions.key?('activejob_retry')
-        job.save!
-      elsif job.cron
-        job.data['last_cron_run'] = Time.now.utc.to_s
-        next_cron_at = Cron.next_schedule_at(job.cron)
-        if next_cron_at
-          job.executions = 1
-          job.exception_executions = nil
-          job.scheduled_at = Time.at(next_cron_at)
-          job.save!
-        else
-          job.delete
-        end
-      elsif Settings['purge_completion']
-        job.delete
-      else
-        job.finished_at = Time.now
-        job.exception_executions = nil
-        job.save!
-      end
-      job
-    rescue Exception => ex
-      if performed
-        Errors[job.id] = true
-        File.write('tmp/cache/skiplock', job.id + "\n", mode: 'a')
-      else
-        Errors[job.id] = false
-      end
-      raise ex
+      job.dispose(ex)
     ensure
       Thread.current[:skiplock_dispatch_job] = nil
     end
 
+    def self.enqueue(activejob)
+      self.enqueue_at(activejob, nil)
+    end
+
     def self.enqueue_at(activejob, timestamp)
       timestamp = Time.at(timestamp) if timestamp
       if Thread.current[:skiplock_dispatch_job].try(:id) == activejob.job_id
@@ -76,8 +35,49 @@ module Skiplock
         Thread.current[:skiplock_dispatch_job].scheduled_at = timestamp
         Thread.current[:skiplock_dispatch_job]
       else
-        Job.create!(id: activejob.job_id, job_class: activejob.class.name, queue_name: activejob.queue_name, locale: activejob.locale, timezone: activejob.timezone, priority: activejob.priority, executions: activejob.executions, data: { 'arguments' => activejob.serialize['arguments'] }, scheduled_at: timestamp)
+        Job.create!(id: activejob.job_id, job_class: activejob.class.name, queue_name: activejob.queue_name, locale: activejob.locale, timezone: activejob.timezone, priority: activejob.priority, data: { 'arguments' => activejob.serialize['arguments'] }, scheduled_at: timestamp)
+      end
+    end
+
+    def dispose(ex)
+      self.running = false
+      self.updated_at = (Time.now > self.updated_at ? Time.now : self.updated_at + 1)
+      if ex
+        self.exception_executions["[#{ex.class.name}]"] = (self.exception_executions["[#{ex.class.name}]"] || 0) + 1 unless self.exception_executions.key?('activejob_retry')
+        if self.executions >= Settings['max_retries'] || self.exception_executions.key?('activejob_retry')
+          self.expired_at = Time.now
+          self.save!
+        else
+          self.scheduled_at = Time.now + (5 * 2**self.executions)
+          self.save!
+        end
+        Skiplock.on_errors.each { |p| p.call(ex) }
+      elsif self.exception_executions.try(:key?, 'activejob_retry')
+        self.save!
+      elsif self.cron
+        self.data ||= {}
+        self.data['crons'] = (self.data['crons'] || 0) + 1
+        self.data['last_cron_at'] = Time.now.utc.to_s
+        next_cron_at = Cron.next_schedule_at(self.cron)
+        if next_cron_at
+          self.executions = nil
+          self.exception_executions = nil
+          self.scheduled_at = Time.at(next_cron_at)
+          self.save!
+        else
+          self.delete
+        end
+      elsif Settings['purge_completion']
+        self.delete
+      else
+        self.finished_at = Time.now
+        self.exception_executions = nil
+        self.save!
       end
+      self
+    rescue
+      File.write("tmp/skiplock/#{self.id}", [self, ex].to_yaml)
+      nil
     end
   end
 end

data/lib/skiplock/manager.rb

@@ -14,9 +14,10 @@ module Skiplock
         Settings['max_threads'] = 20 if Settings['max_threads'] > 20
         Settings['min_threads'] = 0 if Settings['min_threads'] < 0
         Settings['workers'] = 0 if Settings['workers'] < 0
+        Settings['workers'] = 1 if standalone && Settings['workers'] <= 0
         Settings.freeze
       end
-      return unless standalone || restart || (caller.any?{|l| l =~ %r{/rack/}} && (Settings['workers'] == 0 || Rails.env.development?))
+      return unless standalone || restart || (caller.any?{|l| l =~ %r{/rack/}} && Settings['workers'] == 0)
       if standalone
         self.standalone
       else
@@ -42,27 +43,35 @@ module Skiplock
       config = YAML.load_file('config/skiplock.yml') rescue {}
       Settings.merge!(config)
       Settings['queues'].values.each { |v| raise 'Queue value must be an integer' unless v.is_a?(Integer) } if Settings['queues'].is_a?(Hash)
-      case Settings['notification'].to_s.downcase
-      when 'auto'
+      @notification = Settings['notification'] = Settings['notification'].to_s.downcase
+      if @notification == 'auto'
         if defined?(Airbrake)
-          Skiplock.on_error = -> (ex, previous = nil) { Airbrake.notify_sync(ex) unless ex.backtrace == previous.try(:backtrace) }
+          @notification = 'airbrake'
         elsif defined?(Bugsnag)
-          Skiplock.on_error = -> (ex, previous = nil) { Bugsnag.notify(ex) unless ex.backtrace == previous.try(:backtrace) }
+          @notification = 'bugsnag'
         elsif defined?(ExceptionNotifier)
-          Skiplock.on_error = -> (ex, previous = nil) { ExceptionNotifier.notify_exception(ex) unless ex.backtrace == previous.try(:backtrace) }
+          @notification = 'exception_notification'
         else
-          puts "Unable to detect any known exception notification gem. Please define custom 'on_error' function and disable notification in 'config/skiplock.yml'"
+          puts "Unable to detect any known exception notification gem. Please define custom 'on_error' callback function and disable 'auto' notification in 'config/skiplock.yml'"
           exit
         end
+      end
+      case @notification
       when 'airbrake'
         raise 'airbrake gem not found' unless defined?(Airbrake)
-        Skiplock.on_error = -> (ex, previous = nil) { Airbrake.notify_sync(ex) unless ex.backtrace == previous.try(:backtrace) }
+        Skiplock.on_error do |ex, previous|
+          Airbrake.notify_sync(ex) unless ex.backtrace == previous.try(:backtrace)
+        end
       when 'bugsnag'
         raise 'bugsnag gem not found' unless defined?(Bugsnag)
-        Skiplock.on_error = -> (ex, previous = nil) { Bugsnag.notify(ex) unless ex.backtrace == previous.try(:backtrace) }
+        Skiplock.on_error do |ex, previous|
+          Bugsnag.notify(ex) unless ex.backtrace == previous.try(:backtrace)
+        end
       when 'exception_notification'
         raise 'exception_notification gem not found' unless defined?(ExceptionNotifier)
-        Skiplock.on_error = -> (ex, previous = nil) { ExceptionNotifier.notify_exception(ex) unless ex.backtrace == previous.try(:backtrace) }
+        Skiplock.on_error do |ex, previous|
+          ExceptionNotifier.notify_exception(ex) unless ex.backtrace == previous.try(:backtrace)
+        end
       end
     rescue Exception => e
       STDERR.puts "Invalid configuration 'config/skiplock.yml': #{e.message}"
@@ -88,7 +97,7 @@ module Skiplock
       puts title
       puts "-"*(title.length)
       puts "Purge completion: #{Settings['purge_completion']}"
-      puts "    Notification: #{Settings['notification']}"
+      puts "    Notification: #{Settings['notification']}#{(' (' + @notification + ')') if Settings['notification'] == 'auto'}"
       puts "     Max retries: #{Settings['max_retries']}"
       puts "     Min threads: #{Settings['min_threads']}"
       puts "     Max threads: #{Settings['max_threads']}"

data/lib/skiplock/version.rb

@@ -1,4 +1,4 @@
 module Skiplock
-  VERSION = Version = '1.0.8'
+  VERSION = Version = '1.0.9'
 end
 

data/lib/skiplock/worker.rb

@@ -1,5 +1,4 @@
 module Skiplock
   class Worker < ActiveRecord::Base
-    self.table_name = 'skiplock.workers'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skiplock
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Tin Vo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-01 00:00:00.000000000 Z
+date: 2021-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -82,6 +82,7 @@ files:
 - lib/generators/skiplock/install_generator.rb
 - lib/generators/skiplock/templates/migration.rb.erb
 - lib/skiplock.rb
+- lib/skiplock/counter.rb
 - lib/skiplock/cron.rb
 - lib/skiplock/dispatcher.rb
 - lib/skiplock/job.rb
@@ -107,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: ActiveJob Queue Adapter for PostgreSQL