perfectqueue 0.7.16 → 0.7.17

data/ChangeLog

@@ -1,4 +1,9 @@
 
+== 2012-01-10 version 0.7.17
+
+* RDBBackend: disabled connection keepalive
+
+
 == 2012-01-10 version 0.7.16
 
 * RDBBackend: sleep 0.5 before retrying failed transaction by deadlock

data/lib/perfectqueue/backend/rdb.rb

@@ -8,7 +8,7 @@ class RDBBackend < Backend
     @uri = uri
     @table = table
     @db = Sequel.connect(@uri, :max_connections=>1)
-    @last_time = Time.now.to_i
+    #@last_time = Time.now.to_i
     @mutex = Mutex.new
     #init_db(@uri.split('//',2)[0])
     connect {
@@ -51,12 +51,12 @@ SQL
 
   private
   def connect(&block)
-    now = Time.now.to_i
+    #now = Time.now.to_i
     @mutex.synchronize do
-      if now - @last_time > KEEPALIVE
-        @db.disconnect
-      end
-      @last_time = now
+      #if now - @last_time > KEEPALIVE
+      #  @db.disconnect
+      #end
+      #@last_time = now
       retry_count = 0
       begin
         block.call
@@ -74,6 +74,8 @@ SQL
           end
         end
         raise
+      ensure
+        @db.disconnect
       end
     end
   end
@@ -87,7 +89,7 @@ SQL
 
   MAX_SELECT_ROW = 8
   MAX_RESOURCE = (ENV['PQ_MAX_RESOURCE'] || 4).to_i
-  KEEPALIVE = 10
+  #KEEPALIVE = 10
   MAX_RETRY = 10
 
   def acquire(timeout, now=Time.now.to_i)

data/lib/perfectqueue/version.rb

@@ -1,5 +1,5 @@
 module PerfectQueue
 
-VERSION = '0.7.16'
+VERSION = '0.7.17'
 
 end

data/test/stress.rb

@@ -25,7 +25,7 @@ class StressTest
       @num.times {|i|
         now = Time.now.to_i
         @db.submit("#{@key_prefix}-#{i}", "data", now)
-        token, task = @db.acquire(now+60)
+        token, task = @db.acquire(now+60, now)
         if token == nil
           puts "acquire failed"
           next

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: perfectqueue
 version: !ruby/object:Gem::Version
-  version: 0.7.16
+  version: 0.7.17
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &13164680 !ruby/object:Gem::Requirement
+  requirement: &17699280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.26.0
   type: :runtime
   prerelease: false
-  version_requirements: *13164680
+  version_requirements: *17699280
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &13164120 !ruby/object:Gem::Requirement
+  requirement: &17698600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *13164120
+  version_requirements: *17698600
 description: 
 email: frsyuki@gmail.com
 executables: