perfectqueue 0.8.33 → 0.8.34

data/ChangeLog

@@ -1,3 +1,9 @@
+== 2014-05-20 version 0.8.34
+
+* rdb_compat: use connection pooling. Users can specify as :use_connection_pooling
+  option. If connections use SSL, they are, by default, pooled. On the other hand,
+  if not, by default, connection pooling is not used.
+
 == 2014-04-23 version 0.8.33
 
 * Fixed nil variable exception at ChildProcessMonitor#try_join

data/lib/perfectqueue/backend/rdb_compat.rb

@@ -48,16 +48,23 @@ module PerfectQueue
             user: uri.user,
             password: uri.password,
             host: uri.host,
-            port: uri.port ? uri.port.to_i : 3306
+            port: uri.port ? uri.port.to_i : 3306,
+            max_connections: 1
           }
           options[:sslca] = config[:sslca] if config[:sslca]
 
           db_name = uri.path.split('/')[1]
           @db = Sequel.mysql2(db_name, options)
+          if config.fetch(:use_connection_pooling, nil) != nil
+            @use_connection_pooling = !!config[:use_connection_pooling]
+          else
+            @use_connection_pooling = !!config[:sslca]
+          end
         else
           raise ConfigError, "'sqlite' and 'mysql' are supported"
         end
 
+        @last_time = Time.now.to_i
         @mutex = Mutex.new
 
         connect {
@@ -110,7 +117,7 @@ SQL
 
       attr_reader :db
 
-      #KEEPALIVE = 10
+      KEEPALIVE = 10
       MAX_RETRY = 10
       DEFAULT_DELETE_INTERVAL = 20
 
@@ -328,15 +335,15 @@ SQL
 
       protected
       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
+          # keepalive_timeout
+          @db.disconnect if now - @last_time > KEEPALIVE
+
           count = 0
           begin
             block.call
+            @last_time = now
           rescue
             # workaround for "Mysql2::Error: Deadlock found when trying to get lock; try restarting transaction" error
             if $!.to_s.include?('try restarting transaction')
@@ -350,9 +357,14 @@ SQL
                 STDERR.puts err + "\n  abort."
               end
             end
+
+            STDERR.puts "disconnects current connection: #{err}"
+            @db.disconnect
+
             raise
           ensure
-            @db.disconnect
+            # connection_pooling
+            @db.disconnect if !@use_connection_pooling
           end
         end
       end

data/lib/perfectqueue/version.rb

@@ -1,3 +1,3 @@
 module PerfectQueue
-  VERSION = "0.8.33"
+  VERSION = "0.8.34"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: perfectqueue
 version: !ruby/object:Gem::Version
-  version: 0.8.33
+  version: 0.8.34
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-23 00:00:00.000000000 Z
+date: 2014-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -157,7 +157,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4181618303905023933
+      hash: -1427988048662614189
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -166,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4181618303905023933
+      hash: -1427988048662614189
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24