skiplock 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a975a3bb22318c6203edd59428a93d6a4abfa5ea1382f35abd774760467dc23
-  data.tar.gz: 79b787d23af0db0188aebf1b0361649d906d5f0cca4488d7cfcb3f61927d4781
+  metadata.gz: 681b41b73f6ddf95620515f3d83454ba1f623d57740248bf84041829c225318d
+  data.tar.gz: 0433b2e635174ae052b67d7502e4b2477c54736f79ec0acf0ad369a1be976256
 SHA512:
-  metadata.gz: 407469700b1fab6c4ea702b83df0571fd46322ad32c8c8fe8ffc0269e5e93cd9f774b8bd4658021320732ca4de6d7609a64430cbc26bddc14c9f14cf184f92e3
-  data.tar.gz: 69a5fe7f5c88f21585a4b581d34f44183cb12f25bc0df6e7982497fb63c088316a251cc55c4e712b3cad799ec9aa758c8045d911fbeda393267ed39bc694e9a5
+  metadata.gz: 6860b6cff70a8881277fd0ce7d2d76d211723e8c1974a1e2b70db7ea31b05268af6d38b68f2437cc9144d0d896751de205e21890219d3664b0f5ae128e1c6ab0
+  data.tar.gz: ddf11fbb1b030dc437254f87142127fd135bacbb84301d03fbcb14e3029bc05736e9c02b1d08b6be8f2d6b90e3fbfdf8eff568c63c8d8c9b451c730a1a125b39

data/README.md

@@ -48,43 +48,49 @@ The library is quite small compared to other PostgreSQL job queues (eg. *delay_j
     ```
 2. `Skiplock` configuration
     ```yaml
-    # config/skiplock.yml
+    # config/skiplock.yml (default settings)
     ---
-    logging: timestamp
+    extensions: false
+    logging: true
     min_threads: 1
     max_threads: 5
     max_retries: 20
-    notification: auto
+    notification: none
     purge_completion: true
     queues:
       default: 200
-      mailers: 100
+      mailers: 999
     workers: 0
     ```
     Available configuration options are:
-    - **logging** (*enumeration*): sets the logging capability to **true** or **false**; setting to **timestamp** will enable logging with timestamps. The log files are: log/skiplock.log and log/skiplock.error.log
+    - **extensions** (*boolean*): enable or disable the class method extension.  See `ClassMethod extension` for more details
+    - **logging** (*boolean*): enable or disable file logging capability; the log file is stored at log/skiplock.log
     - **min_threads** (*integer*): sets minimum number of threads staying idle
     - **max_threads** (*integer*): sets the maximum number of threads allowed to run jobs
-    - **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`)
+    - **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, none`).  Using `auto` will attempt to detect available gems in the application
     - **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 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
-    # ...
-    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::Manager.start(restart: true) if defined?(Skiplock) && worker_index + 1 == @options[:workers]
-    end
+    #### **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 all the Puma workers will also be able to perform `Skiplock` jobs.
+
+    #### **Standalone mode**
+    `Skiplock` standalone mode can be launched by using the `skiplock` executable; command line options can be provided to override the `Skiplock` configuration file.  
+    ```
+    $ bundle exec skiplock -h
+    Usage: skiplock [options]
+      -e, --environment STRING         Rails environment
+      -l, --logging STRING             Possible values: true, false, timestamp
+      -s, --graceful-shutdown NUM      Number of seconds to wait for graceful shutdown
+      -r, --max-retries NUM            Number of maxixum retries
+      -t, --max-threads NUM            Number of maximum threads
+      -T, --min-threads NUM            Number of minimum threads
+      -w, --workers NUM                Number of workers
+      -h, --help                       Show this message
     ```
+
 ## Usage
 Inside the Rails application:
 - queue your job
@@ -159,10 +165,25 @@ If the `retry_on` block is not defined, then the built-in retry system of `skipl
     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
+      # NOTE: exceptions generated from Job perform method executions will not provide 'previous' exceptions
     end
   end
   # supports multiple on_error callbacks
 ```
+## ClassMethod extension
+`Skiplock` can add extension to allow all class methods to be performed as a background job; it is disabled in the default configuration.  To enable, edit the `config/skiplock.yml` configuration file and change `extensions` to `true`.
+- Queue class method `generate_thumbnails` of class `Image` as background job to run as soon as possible
+  ```ruby
+  Image.skiplock.generate_thumbnails(height: 100, ratio: true)
+  ```
+- Queue class method `cleanup` of class `Session` as background job on queue `maintenance` to run after 5 minutes
+  ```ruby
+  Session.skiplock(wait: 5.minutes, queue: 'maintenance').cleanup
+  ```
+- Queue class method `charge` of class `Subscription` as background job to run tomorrow at noon
+  ```ruby
+  Subscription.skiplock(wait_until: Date.tomorrow.noon).charge(amount: 100)
+  ```
 
 ## Contributing
 

data/bin/skiplock

@@ -6,9 +6,10 @@ begin
     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('-s', '--graceful-shutdown NUM', Integer, 'Number of seconds to wait for graceful shutdown')
+    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
@@ -20,7 +21,8 @@ rescue Exception => e
   puts op
   exit
 end
+options.transform_keys! { |k| k.to_s.gsub('-', '_').to_sym }
 env = options.delete(:environment)
 ENV['RAILS_ENV'] = env if env
 require File.expand_path("config/environment.rb")
-Skiplock::Manager.start(standalone: true, **options)
+Skiplock::Manager.new(options.merge(standalone: true))

data/lib/active_job/queue_adapters/skiplock_adapter.rb

@@ -2,7 +2,7 @@ module ActiveJob
   module QueueAdapters
     class SkiplockAdapter
       def initialize
-        Skiplock::Manager.start
+        Rails.application.config.after_initialize { Skiplock::Manager.new }
       end
 
       def enqueue(job)

data/lib/generators/skiplock/install_generator.rb

@@ -12,7 +12,7 @@ module Skiplock
     end
 
     def create_config_file
-      create_file 'config/skiplock.yml', Skiplock::Settings.to_yaml
+      create_file 'config/skiplock.yml', Skiplock::DEFAULT_CONFIG.to_yaml
     end
 
     def create_migration_file

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

@@ -27,10 +27,11 @@ class CreateSkiplockSchema < ActiveRecord::Migration<%= "[#{ActiveRecord::VERSIO
       t.timestamps null: false, default: -> { 'now()' }
     end
     create_table 'skiplock.workers', id: :uuid do |t|
-      t.integer   :pid, null: false, index: true
-      t.integer   :ppid, index: true
+      t.integer   :pid, null: false
+      t.integer   :sid, null: false
       t.integer   :capacity, null: false
       t.string    :hostname, null: false, index: true
+      t.boolean   :master, null: false, default: false, index: true
       t.jsonb     :data
       t.timestamps null: false, index: true, default: -> { 'now()' }
     end    
@@ -74,7 +75,7 @@ class CreateSkiplockSchema < ActiveRecord::Migration<%= "[#{ActiveRecord::VERSIO
           ELSE
             record = NEW;
           END IF;
-          PERFORM pg_notify('skiplock::workers', CONCAT(TG_OP,',',record.id::TEXT,',',record.hostname,',',record.capacity,',',record.pid,',',record.ppid));
+          PERFORM pg_notify('skiplock::workers', CONCAT(TG_OP,',',record.id::TEXT,',',record.hostname,',',record.master::TEXT,',',record.capacity,',',record.pid,',',record.sid,',',CAST(EXTRACT(EPOCH FROM record.created_at) AS FLOAT)::TEXT,',',CAST(EXTRACT(EPOCH FROM record.updated_at) AS FLOAT)::TEXT));
           RETURN NULL;
         END;
       $$ LANGUAGE plpgsql;
@@ -85,6 +86,7 @@ class CreateSkiplockSchema < ActiveRecord::Migration<%= "[#{ActiveRecord::VERSIO
     execute "CREATE INDEX jobs_retry_index ON skiplock.jobs(scheduled_at) WHERE running = FALSE AND executions IS NOT NULL AND expired_at IS NULL AND finished_at IS NULL"
     execute "CREATE INDEX jobs_cron_index ON skiplock.jobs(scheduled_at ASC NULLS FIRST, priority ASC NULLS LAST, created_at ASC) WHERE cron IS NOT NULL AND finished_at IS NULL"
     execute "CREATE UNIQUE INDEX jobs_unique_cron_index ON skiplock.jobs (job_class) WHERE cron IS NOT NULL"
+    execute "CREATE UNIQUE INDEX workers_unique_master_index ON skiplock.workers(hostname) WHERE master = 't'"
   end
 
   def down

data/lib/skiplock/cron.rb

@@ -6,13 +6,13 @@ module Skiplock
       ActiveJob::Base.descendants.each do |j|
         next unless j.const_defined?('CRON')
         cron = j.const_get('CRON')
-        job = Job.find_by('job_class = ? AND cron IS NOT NULL', j.name) || Job.new(job_class: j.name, cron: cron)
+        job = Job.find_by('job_class = ? AND cron IS NOT NULL', j.name) || Job.new(job_class: j.name, cron: cron, locale: I18n.locale, timezone: Time.zone.name)
         time = self.next_schedule_at(cron)
         if time
           job.cron = cron
           job.running = false
           job.scheduled_at = Time.at(time)
-          job.save!
+          job.save
           cronjobs << j.name
         end
       end

data/lib/skiplock/dispatcher.rb

@@ -1,115 +1,88 @@
 module Skiplock
   class Dispatcher
-    def initialize(master: true, worker_num: nil, worker_pids: [])
-      @queues_order_query = Settings['queues'].map { |q,v| "WHEN queue_name = '#{q}' THEN #{v}" }.join(' ') if Settings['queues'].is_a?(Hash) && Settings['queues'].count > 0
-      @executor = Concurrent::ThreadPoolExecutor.new(min_threads: Settings['min_threads'], max_threads: Settings['max_threads'], max_queue: Settings['max_threads'], idletime: 60, auto_terminate: true, fallback_policy: :discard)
-      @master = master
-      if @master
-        @worker_pids = worker_pids + [ Process.pid ]
-      else
-        @worker_num = worker_num
-      end
+    def initialize(worker:, worker_num: nil, **config)
+      @config = config
+      @worker = worker
+      @queues_order_query = @config[:queues].map { |q,v| "WHEN queue_name = '#{q}' THEN #{v}" }.join(' ') if @config[:queues].is_a?(Hash) && @config[:queues].count > 0
+      @executor = Concurrent::ThreadPoolExecutor.new(min_threads: @config[:min_threads], max_threads: @config[:max_threads], max_queue: @config[:max_threads], idletime: 60, auto_terminate: true, fallback_policy: :discard)
       @last_dispatch_at = 0
       @next_schedule_at = Time.now.to_f
-      @running = true
+      Process.setproctitle("skiplock-#{@worker.master ? 'master[0]' : 'worker[' + @worker_num.to_s + ']'}") if @config[:standalone]
     end
     
     def run
+      @running = true
       Thread.new do
-        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
+        ActiveRecord::Base.connection_pool.with_connection do |connection|
+          connection.exec_query('LISTEN "skiplock::jobs"')
+          if @worker.master
+            Rails.application.eager_load! if Rails.env.development?
+            Dir.mkdir('tmp/skiplock') unless Dir.exist?('tmp/skiplock')
+            check_sync_errors
+            Cron.setup
+          end
+          error = false
+          timestamp = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+          while @running
+            begin
+              if error
+                unless connection.active?
+                  connection.reconnect!
+                  sleep(0.5)
+                  connection.exec_query('LISTEN "skiplock::jobs"')
+                  @next_schedule_at = Time.now.to_f
+                end
+                check_sync_errors
+                error = false
               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
-                  check_sync_errors
-                  error = false
+              job_notifications = []
+              connection.raw_connection.wait_for_notify(0.1) do |channel, pid, payload|
+                job_notifications << payload if payload
+                loop do
+                  payload = connection.raw_connection.notifies
+                  break unless @running && payload
+                  job_notifications << payload[:extra]
                 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
-                      @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
+                job_notifications.each do |n|
+                  op, id, worker_id, queue_name, running, expired_at, finished_at, scheduled_at = n.split(',')
+                  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 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
-              sleep(0.2)
+              if Time.now.to_f >= @next_schedule_at && @executor.remaining_capacity > 0
+                @executor.post { do_work }
+              end
+              if Process.clock_gettime(Process::CLOCK_MONOTONIC) - timestamp > 60
+                @worker.touch
+                timestamp = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+              end
+            rescue Exception => ex
+              # most likely error with database connection
+              Skiplock.logger.error(ex)
+              Skiplock.on_errors.each { |p| p.call(ex, @last_exception) }
+              error = true
+              t = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+              while @running
+                sleep(0.5)
+                break if Process.clock_gettime(Process::CLOCK_MONOTONIC) - t > 5
+              end
+              @last_exception = ex
             end
-            connection.exec_query('UNLISTEN *')
-            @executor.shutdown
-            @executor.wait_for_termination if @wait
-            @worker.delete if @worker
+            sleep(0.2)
           end
+          connection.exec_query('UNLISTEN *')
+          @executor.shutdown
+          @executor.kill unless @executor.wait_for_termination(@config[:graceful_shutdown])
         end
       end
     end
 
-    def shutdown(wait: true)
+    def shutdown
       @running = false
-      @wait = wait
     end
 
     private
@@ -121,7 +94,7 @@ module Skiplock
         disposed = true
         if job_from_db
           job, ex = YAML.load_file(f) rescue nil
-          disposed = job.dispose(ex)
+          disposed = job.dispose(ex, purge_completion: @config[:purge_completion], max_retries: @config[:max_retries])
         end
         File.delete(f) if disposed
       end
@@ -129,15 +102,14 @@ module Skiplock
 
     def do_work
       while @running
-        @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)
+        @last_dispatch_at = Time.now.to_f - 1  # 1 second allowance for time drift
+        result = Job.dispatch(queues_order_query: @queues_order_query, worker_id: @worker.id, purge_completion: @config[:purge_completion], max_retries: @config[:max_retries])
+        next if result.is_a?(Job) && Time.now.to_f >= @next_schedule_at
         @next_schedule_at = result if result.is_a?(Float)
         break
       end
     rescue Exception => ex
-      STDERR.puts ex.message
-      STDERR.puts ex.backtrace
+      Skiplock.logger.error(ex)
       Skiplock.on_errors.each { |p| p.call(ex, @last_exception) }
       @last_exception = ex
     end

data/lib/skiplock/extension.rb

@@ -0,0 +1,25 @@
+module Skiplock
+  module Extension
+    class Proxy < BasicObject
+      def initialize(target, options = {})
+        @target = target
+        @options = options
+      end
+
+      def method_missing(name, *args)
+        ProxyJob.set(@options).perform_later(::YAML.dump([ @target, name, args ]))
+      end
+    end
+
+    class ProxyJob < ActiveJob::Base
+      def perform(yml)
+        target, method_name, args = ::YAML.load(yml)
+        target.__send__(method_name, *args)
+      end
+    end
+
+    def skiplock(options = {})
+      Proxy.new(self, options)
+    end
+  end
+end

data/lib/skiplock/job.rb

@@ -1,24 +1,34 @@
 module Skiplock
   class Job < ActiveRecord::Base
-    def self.dispatch(queues_order_query: nil, worker_id: nil)
-      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)
+    self.implicit_order_column = 'created_at'
+
+    def self.dispatch(queues_order_query: nil, worker_id: nil, purge_completion: true, max_retries: 20)
+      job = nil
+      self.transaction do
+        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
+        return (job ? job.scheduled_at.to_f : Float::INFINITY) if job.nil? || job.scheduled_at.to_f > Time.now.to_f
+        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
       end
-      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 ||= {}
       job_data = job.attributes.slice('job_class', 'queue_name', 'locale', 'timezone', 'priority', 'executions', 'exception_executions').merge('job_id' => job.id, 'enqueued_at' => job.updated_at, 'arguments' => (job.data['arguments'] || []))
       job.executions = (job.executions || 0) + 1
+      Skiplock.logger.info "[Skiplock] Performing #{job.job_class} (#{job.id}) from queue '#{job.queue_name || 'default'}'..."
       Thread.current[:skiplock_dispatch_job] = job
+      start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
       begin
         ActiveJob::Base.execute(job_data)
       rescue Exception => ex
+        Skiplock.logger.error(ex)
+      end
+      end_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      job_name = job.job_class
+      if job.job_class == 'Skiplock::Extension::ProxyJob'
+        target, method_name = ::YAML.load(job.data['arguments'].first)
+        job_name = "'#{target.name}.#{method_name}'"
       end
-      job.dispose(ex)
+      Skiplock.logger.info "[Skiplock] Performed #{job_name} (#{job.id}) from queue '#{job.queue_name || 'default'}' in #{end_time - start_time} seconds"
+      job.dispose(ex, purge_completion: purge_completion, max_retries: max_retries)
     ensure
       Thread.current[:skiplock_dispatch_job] = nil
     end
@@ -35,22 +45,27 @@ 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, data: { 'arguments' => activejob.serialize['arguments'] }, scheduled_at: timestamp)
+        serialize = activejob.serialize
+        Job.create!(serialize.slice(*self.column_names).merge('id' => serialize['job_id'], 'data' => { 'arguments' => serialize['arguments'] }, 'scheduled_at' => timestamp))
       end
     end
 
-    def dispose(ex)
+    def self.reset_retry_schedules
+      self.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)
+    end
+
+    def dispose(ex, purge_completion: true, max_retries: 20)
+      dup = self.dup
       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')
+        if self.executions >= 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
+        self.save!
         Skiplock.on_errors.each { |p| p.call(ex) }
       elsif self.exception_executions.try(:key?, 'activejob_retry')
         self.save!
@@ -67,7 +82,7 @@ module Skiplock
         else
           self.delete
         end
-      elsif Settings['purge_completion']
+      elsif purge_completion
         self.delete
       else
         self.finished_at = Time.now
@@ -76,7 +91,7 @@ module Skiplock
       end
       self
     rescue
-      File.write("tmp/skiplock/#{self.id}", [self, ex].to_yaml)
+      File.write("tmp/skiplock/#{self.id}", [dup, ex].to_yaml)
       nil
     end
   end

data/lib/skiplock/manager.rb

@@ -1,49 +1,83 @@
 module Skiplock
   class Manager
-    def self.start(standalone: false, restart: false, workers: nil, max_retries: nil, max_threads: nil, min_threads: nil, logging: nil)
-      unless Settings.frozen?
-        load_settings
-        Settings['logging'] = logging if logging
-        Settings['max_retries'] = max_retries if max_retries
-        Settings['max_threads'] = max_threads if max_threads
-        Settings['min_threads'] = min_threads if min_threads
-        Settings['workers'] = workers if workers
-        Settings['max_retries'] = 20 if Settings['max_retries'] > 20
-        Settings['max_retries'] = 0 if Settings['max_retries'] < 0
-        Settings['max_threads'] = 1 if Settings['max_threads'] < 1
-        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)
-      if standalone
-        self.standalone
+    def initialize(**config)
+      @config = Skiplock::DEFAULT_CONFIG.dup
+      @config.merge!(YAML.load_file('config/skiplock.yml')) rescue nil
+      @config.symbolize_keys!
+      @config.transform_values! {|v| v.is_a?(String) ? v.downcase : v}
+      @config.merge!(config)
+      Module.__send__(:include, Skiplock::Extension) if @config[:extensions] == true
+      return unless @config[:standalone] || (caller.any?{ |l| l =~ %r{/rack/} } && @config[:workers] == 0)
+      @config[:hostname] = `hostname -f`.strip
+      do_config
+      banner
+      cleanup_workers
+      create_worker
+      ActiveJob::Base.logger = nil
+      if @config[:standalone]
+        standalone
       else
-        @dispatcher = Dispatcher.new
-        @thread = @dispatcher.run
-        at_exit { self.shutdown }
+        dispatcher = Dispatcher.new(worker: @worker, **@config)
+        thread = dispatcher.run
+        at_exit do
+          dispatcher.shutdown
+          thread.join(@config[:graceful_shutdown])
+          @worker.delete
+        end
       end
-      ActiveJob::Base.logger = nil
     end
-    
-    def self.shutdown(wait: true)
-      if @dispatcher && @thread
-        @dispatcher.shutdown(wait: wait)
-        @thread.join
-        @dispatcher = nil
-        @thread = nil
+
+  private
+
+    def banner
+      title = "[Skiplock] V#{Skiplock::VERSION} (Rails #{Rails::VERSION::STRING} | Ruby #{RUBY_VERSION}-p#{RUBY_PATCHLEVEL})"
+      @logger.info "-"*(title.length)
+      @logger.info title
+      @logger.info "-"*(title.length)
+      @logger.info "ClassMethod Extensions: #{@config[:extensions]}"
+      @logger.info "      Purge completion: #{@config[:purge_completion]}"
+      @logger.info "          Notification: #{@config[:notification]}#{(' (' + @notification + ')') if @config[:notification] == 'auto'}"
+      @logger.info "           Max retries: #{@config[:max_retries]}"
+      @logger.info "           Min threads: #{@config[:min_threads]}"
+      @logger.info "           Max threads: #{@config[:max_threads]}"
+      @logger.info "           Environment: #{Rails.env}"
+      @logger.info "               Logging: #{@config[:logging]}"
+      @logger.info "               Workers: #{@config[:workers]}"
+      @logger.info "                Queues: #{@config[:queues].map {|k,v| k + '(' + v.to_s + ')'}.join(', ')}" if @config[:queues].is_a?(Hash)
+      @logger.info "                   PID: #{Process.pid}"
+      @logger.info "-"*(title.length)
+    end
+
+    def cleanup_workers
+      delete_ids = []
+      Worker.where(hostname: @config[:hostname]).each do |worker|
+        sid = Process.getsid(worker.pid) rescue nil
+        delete_ids << worker.id if worker.sid != sid || worker.updated_at < 30.minutes.ago
+      end
+      if delete_ids.count > 0
+        Job.where(running: true, worker_id: delete_ids).update_all(running: false, worker_id: nil)
+        Worker.where(id: delete_ids).delete_all
       end
     end
 
-  private
+    def create_worker(pid: Process.pid, sid: Process.getsid(), master: true)
+      @worker = Worker.create!(pid: pid, sid: sid, master: master, hostname: @config[:hostname], capacity: @config[:max_threads])
+    rescue
+      @worker = Worker.create!(pid: pid, sid: sid, master: false, hostname: @config[:hostname], capacity: @config[:max_threads])
+    end
 
-    def self.load_settings
-      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)
-      @notification = Settings['notification'] = Settings['notification'].to_s.downcase
+    def do_config
+      @config[:graceful_shutdown] = 300 if @config[:graceful_shutdown] > 300
+      @config[:graceful_shutdown] = nil if @config[:graceful_shutdown] < 0
+      @config[:max_retries] = 20 if @config[:max_retries] > 20
+      @config[:max_retries] = 0 if @config[:max_retries] < 0
+      @config[:max_threads] = 1 if @config[:max_threads] < 1
+      @config[:max_threads] = 20 if @config[:max_threads] > 20
+      @config[:min_threads] = 0 if @config[:min_threads] < 0
+      @config[:workers] = 0 if @config[:workers] < 0
+      @config[:workers] = 1 if @config[:standalone] && @config[:workers] <= 0
+      @config[:queues].values.each { |v| raise 'Queue value must be an integer' unless v.is_a?(Integer) } if @config[:queues].is_a?(Hash)
+      @notification = @config[:notification]
       if @notification == 'auto'
         if defined?(Airbrake)
           @notification = 'airbrake'
@@ -52,7 +86,7 @@ module Skiplock
         elsif defined?(ExceptionNotifier)
           @notification = 'exception_notification'
         else
-          puts "Unable to detect any known exception notification gem. Please define custom 'on_error' callback function and disable 'auto' notification in 'config/skiplock.yml'"
+          @logger.info "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
@@ -73,92 +107,52 @@ module Skiplock
           ExceptionNotifier.notify_exception(ex) unless ex.backtrace == previous.try(:backtrace)
         end
       end
-    rescue Exception => e
-      STDERR.puts "Invalid configuration 'config/skiplock.yml': #{e.message}"
-      exit
+      Skiplock.logger = ActiveSupport::Logger.new(STDOUT)
+      Skiplock.logger.level = Rails.logger.level
+      @logger = Skiplock.logger
+      if @config[:logging]
+        Skiplock.logger.extend(ActiveSupport::Logger.broadcast(::Logger.new('log/skiplock.log')))
+        if @config[:standalone]
+          Rails.logger.reopen('/dev/null')
+          Rails.logger.extend(ActiveSupport::Logger.broadcast(Skiplock.logger))
+        end
+      end
+      Skiplock.on_errors.freeze unless Skiplock.on_errors.frozen?
     end
 
-    def self.standalone
-      if Settings['logging']
-        log_timestamp = (Settings['logging'].to_s == 'timestamp')
-        logfile = File.open('log/skiplock.log', 'a')
-        logfile.sync = true
-        $stdout = Demux.new(logfile, STDOUT, timestamp: log_timestamp)
-        errfile = File.open('log/skiplock.error.log', 'a')
-        errfile.sync = true
-        $stderr = Demux.new(errfile, STDERR, timestamp: log_timestamp)
-        logger = ActiveSupport::Logger.new($stdout)
-        logger.level = Rails.logger.level
-        Rails.logger.reopen('/dev/null')
-        Rails.logger.extend(ActiveSupport::Logger.broadcast(logger))
-      end
-      title = "Skiplock version: #{Skiplock::VERSION} (Ruby #{RUBY_VERSION}-p#{RUBY_PATCHLEVEL})"
-      puts "-"*(title.length)
-      puts title
-      puts "-"*(title.length)
-      puts "Purge completion: #{Settings['purge_completion']}"
-      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']}"
-      puts "     Environment: #{Rails.env}"
-      puts "         Logging: #{Settings['logging']}"
-      puts "         Workers: #{Settings['workers']}"
-      puts "          Queues: #{Settings['queues'].map {|k,v| k + '(' + v.to_s + ')'}.join(', ')}" if Settings['queues'].is_a?(Hash)
-      puts "             PID: #{Process.pid}"
-      puts "-"*(title.length)
+    def standalone
       parent_id = Process.pid
       shutdown = false
       Signal.trap("INT") { shutdown = true }
       Signal.trap("TERM") { shutdown = true }
-      worker_pids = []
-      (Settings['workers']-1).times do |n|
-        worker_pids << fork do
-          dispatcher = Dispatcher.new(master: false, worker_num: n+1)
+      (@config[:workers] - 1).times do |n|
+        fork do
+          sleep 1
+          worker = create_worker(master: false)
+          dispatcher = Dispatcher.new(worker: worker, worker_num: n + 1, **@config)
           thread = dispatcher.run
           loop do
             sleep 0.5
             break if shutdown || Process.ppid != parent_id
           end
-          dispatcher.shutdown(wait: true)
-          thread.join
+          dispatcher.shutdown
+          thread.join(@config[:graceful_shutdown])
+          worker.delete
           exit
         end
       end
-      sleep 0.1
-      dispatcher = Dispatcher.new(worker_pids: worker_pids)
+      dispatcher = Dispatcher.new(worker: @worker, **@config)
       thread = dispatcher.run
       loop do
         sleep 0.5
         break if shutdown
       end
+      @logger.info "[Skiplock] Terminating signal... Waiting for jobs to finish (up to #{@config[:graceful_shutdown]} seconds)..." if @config[:graceful_shutdown]
       Process.waitall
-      dispatcher.shutdown(wait: true)
-      thread.join
-    end
-
-    class Demux
-      def initialize(*targets, timestamp: true)
-        @targets = targets
-        @timestamp = timestamp
-      end
-
-      def close
-        @targets.each(&:close)
-      end
-
-      def flush
-        @targets.each(&:flush)
-      end
-  
-      def tty?
-        true
-      end
-
-      def write(*args)
-        args.prepend("[#{Time.now.utc}]: ") if @timestamp
-        @targets.each {|t| t.write(*args)}
-      end
+      dispatcher.shutdown
+      thread.join(@config[:graceful_shutdown])
+      @worker.delete
+      @logger.info "[Skiplock] Shutdown completed."
     end
   end
 end

data/lib/skiplock/version.rb

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

data/lib/skiplock/worker.rb

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

data/lib/skiplock.rb

@@ -4,29 +4,31 @@ require 'active_record'
 require 'skiplock/counter'
 require 'skiplock/cron'
 require 'skiplock/dispatcher'
+require 'skiplock/extension'
 require 'skiplock/job'
 require 'skiplock/manager'
 require 'skiplock/worker'
 require 'skiplock/version'
 
 module Skiplock
-  Settings = { 
-    'logging' => 'timestamp',
-    'min_threads' => 1,
-    'max_threads' => 5,
-    'max_retries' => 20,
-    'notification' => 'auto',
-    'purge_completion' => true,
-    'queues' => {
-      'default' => 200,
-      'mailers' => 100
-    },
-    'workers' => 0
-  }
-  mattr_reader :on_errors, default: []
+  DEFAULT_CONFIG = { 'extensions' => false, 'logging' => true, 'graceful_shutdown' => 15, 'min_threads' => 1, 'max_threads' => 5, 'max_retries' => 20, 'notification' => 'none', 'purge_completion' => true, 'queues' => { 'default' => 100, 'mailers' => 999 }, 'workers' => 0 }.freeze
+
+  def self.logger=(l)
+    @logger = l
+  end
+
+  def self.logger
+    @logger
+  end
 
   def self.on_error(&block)
-    @@on_errors << block
+    @on_errors ||= []
+    @on_errors << block
+    block
+  end
+
+  def self.on_errors
+    @on_errors || [].freeze
   end
 
   def self.table_name_prefix

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skiplock
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Tin Vo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-08 00:00:00.000000000 Z
+date: 2021-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -85,6 +85,7 @@ files:
 - lib/skiplock/counter.rb
 - lib/skiplock/cron.rb
 - lib/skiplock/dispatcher.rb
+- lib/skiplock/extension.rb
 - lib/skiplock/job.rb
 - lib/skiplock/manager.rb
 - lib/skiplock/version.rb