perfectqueue 0.8.52 → 0.8.53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12dbac4bd43f2530c655cca57966c3ef526cf80e
-  data.tar.gz: fc5ca0c0c89dd05e8a3108b2f85da926c63e7429
+  metadata.gz: d8e8fc7751663faba5c1ac7de3151649c42a3493
+  data.tar.gz: c7f27e4e75b0faa7aceb267ef478089641291269
 SHA512:
-  metadata.gz: 22fe10784102843c3de34a55871c6c7d69ce79ca339036eeff97c482a24339a1dce3ca4dea1675100a7c31c9379493dca52b98108683462a1ed79c544706e921
-  data.tar.gz: 23794ebacf99f34dcaa87d007f1460800f42f5ba75c8ec21e10b17a57f370b1b216cc6559eb44ade47d2860ec144678d822baaea587484f2ad87e89baec327c6
+  metadata.gz: c64103797dd50c941a428bc6e265a4f54104773b781447de70c3f3fedbc487efdcdb9858e20b0d48a151d6149e6359cefbe6f94b988e35abd3a35dd0db9e9c11
+  data.tar.gz: 8abe49cd58c5b38c8eb3b713c2e9c259a9189993e445520afd2a561db57d52650a6e59305ea7874ead43c03d12d4c476b04d667e41f8faa95203d78110b6857a

data/ChangeLog

@@ -1,3 +1,7 @@
+== 2019-10-10 version 0.8.53
+
+* Extract max_retry_count as config parameter (#66)
+
 == 2019-07-31 version 0.8.52
 
 * Add sleep lock retrying with exponential-backoff (#64)

data/lib/perfectqueue/backend/rdb.rb

@@ -4,7 +4,6 @@ require_relative 'rdb_compat'
 
 module PerfectQueue::Backend
   class RDBBackend
-    MAX_RETRY = ::PerfectQueue::Backend::RDBCompatBackend::MAX_RETRY
     DELETE_OFFSET = ::PerfectQueue::Backend::RDBCompatBackend::DELETE_OFFSET
     class Token < Struct.new(:key)
     end
@@ -22,6 +21,7 @@ module PerfectQueue::Backend
         port: u.port ? u.port.to_i : 3306
       }
       @pq_connect_timeout = config.fetch(:pq_connect_timeout, 20)
+      @max_retry_count = config.fetch(:max_retry_count, 10)
       options[:connect_timeout] = config.fetch(:connect_timeout, 3)
       options[:sslca] = config[:sslca] if config[:sslca]
       db_name = u.path.split('/')[1]
@@ -34,6 +34,7 @@ module PerfectQueue::Backend
     end
 
     attr_reader :db
+    attr_reader :max_retry_count
 
     def submit(id, data, time=Process.clock_gettime(Process::CLOCK_REALTIME, :second), resource=nil, max_running=nil)
       connect {
@@ -63,7 +64,7 @@ module PerfectQueue::Backend
         begin
           yield
         rescue Sequel::DatabaseConnectionError
-          if (retry_count += 1) < MAX_RETRY && tmax > Process.clock_gettime(Process::CLOCK_REALTIME, :second)
+          if (retry_count += 1) < @max_retry_count && tmax > Process.clock_gettime(Process::CLOCK_REALTIME, :second)
             STDERR.puts "#{$!}\n  retrying."
             sleep 2
             retry
@@ -75,7 +76,7 @@ module PerfectQueue::Backend
           if $!.to_s.include?('try restarting transaction')
             err = $!.backtrace.map{|bt| "  #{bt}" }.unshift($!).join("\n")
             retry_count += 1
-            if retry_count < MAX_RETRY
+            if retry_count < @max_retry_count
               STDERR.puts "#{err}\n  retrying."
               sleep 0.5
               retry

data/lib/perfectqueue/backend/rdb_compat.rb

@@ -43,6 +43,7 @@ module PerfectQueue
         super
 
         @pq_connect_timeout = config.fetch(:pq_connect_timeout, 20)
+        @max_retry_count = config.fetch(:max_retry_count, 10)
         url = config[:url]
         @table = config[:table]
         unless @table
@@ -121,9 +122,9 @@ SQL
       end
 
       attr_reader :db
+      attr_reader :max_retry_count
 
       KEEPALIVE = 10
-      MAX_RETRY = 10
       LOCK_WAIT_TIMEOUT = 10
       DEFAULT_DELETE_INTERVAL = 20
 
@@ -373,7 +374,7 @@ SQL
             yield
             @last_time = now
           rescue Sequel::DatabaseConnectionError
-            if (count += 1) < MAX_RETRY && tmax > Time.now.to_i
+            if (count += 1) < @max_retry_count && tmax > Time.now.to_i
               STDERR.puts "#{$!}\n  retrying."
               sleep 2
               retry
@@ -385,7 +386,7 @@ SQL
             if $!.to_s.include?('try restarting transaction')
               err = ([$!] + $!.backtrace.map {|bt| "  #{bt}" }).join("\n")
               count += 1
-              if count < MAX_RETRY
+              if count < @max_retry_count
                 STDERR.puts err + "\n  retrying."
                 sleep rand
                 retry

data/lib/perfectqueue/version.rb

@@ -1,3 +1,3 @@
 module PerfectQueue
-  VERSION = "0.8.52"
+  VERSION = "0.8.53"
 end

data/spec/rdb_backend_spec.rb

@@ -55,7 +55,7 @@ describe Backend::RDBBackend do
     end
     context 'error' do
       it 'returns block result' do
-        expect(RuntimeError).to receive(:new).exactly(Backend::RDBBackend::MAX_RETRY).and_call_original
+        expect(RuntimeError).to receive(:new).exactly(db.max_retry_count).and_call_original
         allow(STDERR).to receive(:puts)
         allow(db).to receive(:sleep)
         expect do

data/spec/rdb_compat_backend_spec.rb

@@ -367,7 +367,7 @@ describe Backend::RDBCompatBackend do
     end
     context 'error' do
       it 'returns block result' do
-        expect(RuntimeError).to receive(:new).exactly(Backend::RDBCompatBackend::MAX_RETRY).and_call_original
+        expect(RuntimeError).to receive(:new).exactly(db.max_retry_count).and_call_original
         allow(STDERR).to receive(:puts)
         allow(db).to receive(:sleep)
         expect do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: perfectqueue
 version: !ruby/object:Gem::Version
-  version: 0.8.52
+  version: 0.8.53
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-31 00:00:00.000000000 Z
+date: 2019-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -176,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Highly available distributed cron built on RDBMS