skiplock 1.0.18 → 1.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8112589dcbdf58a743529ec9bf5ddd8371791e83e79c0d455ed42cbca05ee5eb
-  data.tar.gz: 149f826e93ecd8ac6165a8db46a8e7e234636a4481e68bf09d208b04a1dea1ce
+  metadata.gz: 982ed70ce969943c421cad0923a280c87c4c26ea90da5a3451ce73becd5db42e
+  data.tar.gz: 9f68becb9ab21e00816315d1e2ff20058d2f5942a3688ed78959018e3ccf940f
 SHA512:
-  metadata.gz: 437f622f2398a0a6c965ea1720f77f11b9241373f277e249e4f3d39afbd3bccc7d8ad2b919abd141ebc5bc6a2543408a7940e53f2968c3cda9fc0519ac387910
-  data.tar.gz: '0473939dc2497842ff66fb02e2f74371f7281d58cc5ac82f1999b669f5b45e526d5d75054a3cc95594e26fc5f4e4aafc42e15d2f7336b88223256d6f7ac46d4e'
+  metadata.gz: 0fb583418cf8c0a190f9b651ecd95effba2d4b415f91bf6fbd452d2271f02534e7c5823e360f1e7a258cdd0a22b14cc99d44915007e9c32a186371748c086144
+  data.tar.gz: 6aa546ad0a538213ae9587e667543027fb2ca080e7623b3f409fe6303c005085f39fd27c310a690a2da9fbb50321d97519ed9aee7bb4922a126c0a280f6ad5fe

data/README.md

@@ -201,9 +201,9 @@ To enable extension for specific classes and modules only then set the configura
   ```ruby
   Session.skiplock(wait: 5.minutes, queue: 'maintenance').cleanup
   ```
-- Queue class method `charge` of class `Subscription` as background job to run tomorrow at noon
+- Queue class method `charge` of class `Subscription` as background job to run tomorrow at noon without purging
   ```ruby
-  Subscription.skiplock(wait_until: Date.tomorrow.noon).charge(amount: 100)
+  Subscription.skiplock(purge: false, wait_until: Date.tomorrow.noon).charge(amount: 100)
   ```
 
 ## Fault tolerant

data/bin/skiplock

@@ -7,6 +7,7 @@ begin
     opts.banner = "Usage: #{File.basename($0)} [options]"
     opts.on('-e', '--environment STRING', String, 'Rails environment')
     opts.on('-l', '--logfile STRING', String, 'Log filename')
+    opts.on('-L', '--loglevel STRING', String, 'Log level (debug, info, warn, error, fatal, unknown)')
     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')

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

@@ -46,18 +46,20 @@ class CreateSkiplockSchema < ActiveRecord::Migration<%= "[#{ActiveRecord::VERSIO
             IF (record.running = TRUE) THEN
               INSERT INTO skiplock.counters (day,completions) VALUES (NOW(),1) ON CONFLICT (day) DO UPDATE SET completions = skiplock.counters.completions + 1;
             END IF;
-          ELSIF (record.running = TRUE) THEN
-            IF (record.executions > 0) THEN
-              INSERT INTO skiplock.counters (day,retries) VALUES (NOW(),1) ON CONFLICT (day) DO UPDATE SET retries = skiplock.counters.retries + 1;
-            ELSE
-              INSERT INTO skiplock.counters (day,dispatches) VALUES (NOW(),1) ON CONFLICT (day) DO UPDATE SET dispatches = skiplock.counters.dispatches + 1;
+          ELSIF (TG_OP = 'UPDATE') THEN
+            IF (OLD.running = FALSE AND record.running = TRUE) THEN
+              IF (record.executions > 0) THEN
+                INSERT INTO skiplock.counters (day,retries) VALUES (NOW(),1) ON CONFLICT (day) DO UPDATE SET retries = skiplock.counters.retries + 1;
+              ELSE
+                INSERT INTO skiplock.counters (day,dispatches) VALUES (NOW(),1) ON CONFLICT (day) DO UPDATE SET dispatches = skiplock.counters.dispatches + 1;
+              END IF;
+            ELSIF (OLD.finished_at IS NULL AND 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 (OLD.running = TRUE AND record.running = FALSE AND 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 (OLD.running = TRUE AND record.running = FALSE AND record.expired_at IS NULL AND record.finished_at IS NULL) THEN
+              INSERT INTO skiplock.counters (day,failures) VALUES (NOW(),1) ON CONFLICT (day) DO UPDATE SET failures = skiplock.counters.failures + 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 (TG_OP = 'UPDATE' AND OLD.running = TRUE AND NEW.running = FALSE) 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.job_class,',',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;
@@ -85,7 +87,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'"
+    execute "CREATE UNIQUE INDEX workers_unique_master_index ON skiplock.workers(hostname) WHERE master = TRUE"
   end
 
   def down

data/lib/skiplock/job.rb

@@ -1,7 +1,7 @@
 module Skiplock
   class Job < ActiveRecord::Base
     self.implicit_order_column = 'updated_at'
-    attr_accessor :activejob_retry
+    attr_accessor :activejob_error
     belongs_to :worker, inverse_of: :jobs, required: false
 
     def self.dispatch(purge_completion: true, max_retries: 20)
@@ -19,16 +19,16 @@ module Skiplock
     end
 
     def self.enqueue_at(activejob, timestamp)
+      options = activejob.instance_variable_get('@skiplock_options') || {}
       timestamp = Time.at(timestamp) if timestamp
       if Thread.current[:skiplock_job].try(:id) == activejob.job_id
-        Thread.current[:skiplock_job].activejob_retry = true
-        Thread.current[:skiplock_job].data['activejob_retry'] = true
+        Thread.current[:skiplock_job].activejob_error = options[:error]
+        Thread.current[:skiplock_job].data['activejob_error'] = true
         Thread.current[:skiplock_job].executions = activejob.executions
         Thread.current[:skiplock_job].exception_executions = activejob.exception_executions
         Thread.current[:skiplock_job].scheduled_at = timestamp
         Thread.current[:skiplock_job]
       else
-        options = activejob.instance_variable_get('@skiplock_options') || {}
         serialize = activejob.serialize
         self.create!(serialize.slice(*self.column_names).merge('id' => serialize['job_id'], 'data' => { 'arguments' => serialize['arguments'], 'options' => options }, 'scheduled_at' => timestamp))
       end
@@ -61,8 +61,8 @@ module Skiplock
       self.worker_id = nil
       self.updated_at = Time.now > self.updated_at ? Time.now : self.updated_at + 1 # in case of clock drifting
       if @exception
-        self.exception_executions["[#{@exception.class.name}]"] = self.exception_executions["[#{@exception.class.name}]"].to_i + 1 unless self.activejob_retry
-        if (self.executions.to_i >= @max_retries + 1) || self.data.key?('activejob_retry') || @exception.is_a?(Skiplock::Extension::ProxyError)
+        self.exception_executions["[#{@exception.class.name}]"] = self.exception_executions["[#{@exception.class.name}]"].to_i + 1 unless self.data.key?('activejob_error')
+        if (self.executions.to_i >= @max_retries + 1) || self.data.key?('activejob_error') || @exception.is_a?(Skiplock::Extension::ProxyError)
           self.expired_at = Time.now
         else
           self.scheduled_at = Time.now + (5 * 2**self.executions.to_i)
@@ -103,11 +103,12 @@ module Skiplock
 
     def execute(purge_completion: true, max_retries: 20)
       raise 'Job has already been completed' if self.finished_at
+      self.update_columns(running: true, updated_at: Time.now) unless self.running
       Skiplock.logger.info("[Skiplock] Performing #{self.job_class} (#{self.id}) from queue '#{self.queue_name || 'default'}'...") if Skiplock.logger
       self.data ||= {}
       self.data.delete('result')
       self.exception_executions ||= {}
-      self.activejob_retry = false
+      self.activejob_error = nil
       @max_retries = (self.data['options'].key?('max_retries') ? self.data['options']['max_retries'].to_i : max_retries) rescue max_retries
       @max_retries = 20 if @max_retries < 0 || @max_retries > 20
       @purge = (self.data['options'].key?('purge') ? self.data['options']['purge'] : purge_completion) rescue purge_completion
@@ -122,8 +123,8 @@ module Skiplock
         Skiplock.on_errors.each { |p| p.call(@exception) }
       end
       if Skiplock.logger
-        if @exception || self.activejob_retry
-          Skiplock.logger.error("[Skiplock] Job #{self.job_class} (#{self.id}) was interrupted by an exception#{ ' (rescued and retried by ActiveJob)' if self.activejob_retry }")
+        if @exception || self.activejob_error
+          Skiplock.logger.error("[Skiplock] Job #{self.job_class} (#{self.id}) was interrupted by an exception#{ ' (rescued and retried by ActiveJob)' if self.activejob_error }")
           if @exception
             Skiplock.logger.error(@exception.to_s)
             Skiplock.logger.error(@exception.backtrace.join("\n"))
@@ -138,8 +139,9 @@ module Skiplock
           Skiplock.logger.info "[Skiplock] Performed #{job_name} (#{self.id}) from queue '#{self.queue_name || 'default'}' in #{end_time - start_time} seconds"
         end
       end
+      @exception || self.activejob_error || self.data['result']
     ensure
-      self.finished_at ||= Time.now if self.data.key?('result') && !self.activejob_retry
+      self.finished_at ||= Time.now if self.data.key?('result') && !self.activejob_error
       self.dispose
     end
   end

data/lib/skiplock/manager.rb

@@ -4,16 +4,16 @@ module Skiplock
       @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}
-      @hostname = Socket.gethostname
+      async if (caller.any?{ |l| l =~ %r{/rack/} } && @config[:workers] == 0)
+    end
+
+    def async
       configure
       setup_logger
-      if (caller.any?{ |l| l =~ %r{/rack/} } && @config[:workers] == 0)
-        Worker.cleanup(@hostname)
-        @worker = Worker.generate(capacity: @config[:max_threads], hostname: @hostname)
-        @worker.start(**@config)
-        at_exit { @worker.shutdown }
-      end
+      Worker.cleanup(@hostname)
+      @worker = Worker.generate(capacity: @config[:max_threads], hostname: @hostname)
+      @worker.start(**@config)
+      at_exit { @worker.shutdown }
     rescue Exception => ex
       @logger.error(ex.to_s)
       @logger.error(ex.backtrace.join("\n"))
@@ -21,6 +21,8 @@ module Skiplock
 
     def standalone(**options)
       @config.merge!(options)
+      configure
+      setup_logger
       Rails.logger.reopen('/dev/null') rescue Rails.logger.reopen('NUL') # supports Windows NUL device
       Rails.logger.extend(ActiveSupport::Logger.broadcast(@logger))
       @config[:workers] = 1 if @config[:workers] <= 0
@@ -34,6 +36,7 @@ module Skiplock
       Signal.trap('TERM') { @shutdown = true }
       Signal.trap('HUP') { setup_logger }
       (@config[:workers] - 1).times do |n|
+        sleep 0.2
         fork do
           sleep 1
           worker = Worker.generate(capacity: @config[:max_threads], hostname: @hostname, master: false)
@@ -53,7 +56,9 @@ module Skiplock
       @logger.info "[Skiplock] Terminating signal... Waiting for jobs to finish (up to #{@config[:graceful_shutdown]} seconds)..." if @config[:graceful_shutdown]
       Process.waitall
       @worker.shutdown
-      @logger.info "[Skiplock] Shutdown completed."
+    rescue Exception => ex
+      @logger.error(ex.to_s)
+      @logger.error(ex.backtrace.join("\n"))
     end
 
     private
@@ -80,6 +85,8 @@ module Skiplock
     end
 
     def configure
+      @hostname = Socket.gethostname
+      @config.transform_values! {|v| v.is_a?(String) ? v.downcase : v}
       @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
@@ -100,6 +107,12 @@ module Skiplock
           raise "Unable to detect any known exception notification library. Please define custom 'on_error' event callbacks and change to 'custom' notification in 'config/skiplock.yml'"
         end
       end
+      Rails.application.eager_load! if Rails.env.development?
+      if @config[:extensions] == true
+        Module.__send__(:include, Skiplock::Extension)
+      elsif @config[:extensions].is_a?(Array)
+        @config[:extensions].each { |n| n.constantize.__send__(:extend, Skiplock::Extension) if n.safe_constantize }
+      end
       case @config[:notification]
       when 'airbrake'
         raise 'airbrake gem not found' unless defined?(Airbrake)
@@ -119,19 +132,13 @@ module Skiplock
       else
         @config[:notification] = 'custom'
       end
-      Rails.application.eager_load! if Rails.env.development?
-      if @config[:extensions] == true
-        Module.__send__(:include, Skiplock::Extension)
-      elsif @config[:extensions].is_a?(Array)
-        @config[:extensions].each { |n| n.constantize.__send__(:extend, Skiplock::Extension) if n.safe_constantize }
-      end
-      Skiplock.on_errors.freeze unless Skiplock.on_errors.frozen?
+      Skiplock.on_errors.freeze
     end
 
     def setup_logger
-      @config[:loglevel] = 'info' unless ['debug','info','warn','error','fatal','unknown'].include?(@config[:loglevel].to_s.downcase)
+      @config[:loglevel] = 'info' unless ['debug','info','warn','error','fatal','unknown'].include?(@config[:loglevel].to_s)
       @logger = ActiveSupport::Logger.new(STDOUT)
-      @logger.level = @config[:loglevel].downcase.to_sym
+      @logger.level = @config[:loglevel].to_sym
       Skiplock.logger = @logger
       if @config[:logfile].to_s.length > 0
         @logger.extend(ActiveSupport::Logger.broadcast(::Logger.new(File.join(Rails.root, 'log', @config[:logfile].to_s), 'daily')))

data/lib/skiplock/patch.rb

@@ -1,7 +1,7 @@
 module Skiplock
   module Patch
     def enqueue(options = {})
-      self.instance_variable_set('@skiplock_options', options)
+      @skiplock_options = options
       super
     end
   end

data/lib/skiplock/version.rb

@@ -1,4 +1,4 @@
 module Skiplock
-  VERSION = Version = '1.0.18'
+  VERSION = Version = '1.0.20'
 end
 

data/lib/skiplock/worker.rb

@@ -23,12 +23,13 @@ module Skiplock
         Job.flush
         Cron.setup
       end
+      @num = worker_num
       @config = config
       @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
       @running = true
       @executor = Concurrent::ThreadPoolExecutor.new(min_threads: @config[:min_threads] + 1, max_threads: @config[:max_threads] + 1, max_queue: @config[:max_threads], idletime: 60, auto_terminate: true, fallback_policy: :discard)
       @executor.post { run }
-      Process.setproctitle("skiplock-#{self.master ? 'master[0]' : 'worker[' + worker_num.to_s + ']'}") if @config[:standalone]
+      Process.setproctitle("skiplock: #{self.master ? 'master' : 'cluster'} worker#{(' ' + @num.to_s) if @num > 0 && @config[:workers] > 2} [#{Rails.application.class.name.deconstantize.downcase}:#{Rails.env}]") if @config[:standalone]
     end
 
     def shutdown
@@ -36,82 +37,79 @@ module Skiplock
       @executor.shutdown
       @executor.kill unless @executor.wait_for_termination(@config[:graceful_shutdown])
       self.delete
+      Skiplock.logger.info "[Skiplock] Shutdown of #{self.master ? 'master' : 'cluster'} worker#{(' ' + @num.to_s) if @num > 0 && @config[:workers] > 2} (PID: #{self.pid}) was completed."
     end
 
     private
 
-    def get_next_available_job
-      @connection.transaction do
-        job = Job.find_by_sql("SELECT id, running, scheduled_at FROM skiplock.jobs 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 && job.scheduled_at.to_f <= Time.now.to_f
-          job = Job.find_by_sql("UPDATE skiplock.jobs SET running = TRUE, worker_id = '#{self.id}', updated_at = NOW() WHERE id = '#{job.id}' RETURNING *").first
-        end
-        job
-      end
-    end
-
     def run
-      error = false
-      listen = false
-      next_schedule_at = Time.now.to_f
-      timestamp = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-      while @running
-        Rails.application.reloader.wrap do
-          begin
-            unless listen
-              @connection = self.class.connection
-              @connection.exec_query('LISTEN "skiplock::jobs"')
-              listen = true
-            end
-            if error
-              unless @connection.active?
-                @connection.reconnect!
-                sleep(0.5)
-                @connection.exec_query('LISTEN "skiplock::jobs"')
-                next_schedule_at = Time.now.to_f
+      sleep 3
+      ActiveRecord::Base.connection_pool.with_connection do |connection|
+        Skiplock.logger.info "[Skiplock] Starting in #{@config[:standalone] ? 'standalone' : 'async'} mode (PID: #{self.pid}) with #{@config[:max_threads]} max threads as #{self.master ? 'master' : 'cluster'} worker#{(' ' + @num.to_s) if @num > 0 && @config[:workers] > 2}..."
+        connection.exec_query('LISTEN "skiplock::jobs"')
+        error = false
+        next_schedule_at = Time.now.to_f
+        timestamp = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+        while @running
+          Rails.application.reloader.wrap do
+            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
+                Job.flush if self.master
+                error = false
               end
-              Job.flush if self.master
-              error = false
-            end
-            if Time.now.to_f >= next_schedule_at && @executor.remaining_capacity > 0
-              job = get_next_available_job
-              if job.try(:running)
-                @executor.post { Rails.application.reloader.wrap { job.execute(purge_completion: @config[:purge_completion], max_retries: @config[:max_retries]) } }
-              else
-                next_schedule_at = (job ? job.scheduled_at.to_f : Float::INFINITY)
+              if Time.now.to_f >= next_schedule_at && @executor.remaining_capacity > 0
+                job = nil
+                connection.transaction do
+                  result = connection.select_all("SELECT id, running, scheduled_at FROM skiplock.jobs 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
+                  result = connection.select_all("UPDATE skiplock.jobs SET running = TRUE, worker_id = '#{self.id}', updated_at = NOW() WHERE id = '#{result['id']}' RETURNING *").first if result && result['scheduled_at'].to_f <= Time.now.to_f
+                  job = Job.instantiate(result) if result
+                end
+                if job.try(:running)
+                  @executor.post do
+                    Rails.application.executor.wrap { job.execute(purge_completion: @config[:purge_completion], max_retries: @config[:max_retries]) }
+                  end
+                else
+                  next_schedule_at = (job ? job.scheduled_at.to_f : Float::INFINITY)
+                end
               end
-            end
-            job_notifications = []
-            @connection.raw_connection.wait_for_notify(0.4) do |channel, pid, payload|
-              job_notifications << payload if payload
-              loop do
-                payload = @connection.raw_connection.notifies
-                break unless @running && payload
-                job_notifications << payload[:extra]
+              job_notifications = []
+              connection.raw_connection.wait_for_notify(0.2) 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
+                job_notifications.each do |n|
+                  op, id, worker_id, job_class, 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
+                  next_schedule_at = scheduled_at.to_f if scheduled_at.to_f < next_schedule_at
+                end
               end
-              job_notifications.each do |n|
-                op, id, worker_id, job_class, 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
-                next_schedule_at = scheduled_at.to_f if scheduled_at.to_f < next_schedule_at
+              if Process.clock_gettime(Process::CLOCK_MONOTONIC) - timestamp > 60
+                self.touch
+                timestamp = Process.clock_gettime(Process::CLOCK_MONOTONIC)
               end
+            rescue Exception => ex
+              # most likely error with database connection
+              Skiplock.logger.error(ex.to_s)
+              Skiplock.logger.error(ex.backtrace.join("\n"))
+              Skiplock.on_errors.each { |p| p.call(ex, @last_exception) }
+              error = true
+              wait(5)
+              @last_exception = ex
             end
-            if Process.clock_gettime(Process::CLOCK_MONOTONIC) - timestamp > 60
-              self.touch
-              timestamp = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-            end
-          rescue Exception => ex
-            # most likely error with database connection
-            Skiplock.logger.error(ex.to_s)
-            Skiplock.logger.error(ex.backtrace.join("\n"))
-            Skiplock.on_errors.each { |p| p.call(ex, @last_exception) }
-            error = true
-            wait(5)
-            @last_exception = ex
+            sleep(0.3)
           end
-          sleep(0.3)
         end
+        connection.exec_query('UNLISTEN *')
       end
-      @connection.exec_query('UNLISTEN *')
     end
 
     def wait(timeout)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skiplock
 version: !ruby/object:Gem::Version
-  version: 1.0.18
+  version: 1.0.20
 platform: ruby
 authors:
 - Tin Vo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-12 00:00:00.000000000 Z
+date: 2021-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: ActiveJob Queue Adapter for PostgreSQL