beanpool 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0705f27b3d44d5c4c7ecde03349eaa3748f56b7
-  data.tar.gz: 6990d29b2d36f51d8075f6c68314429638f627c4
+  metadata.gz: 4d4160a86836f9eee120d3eeaebef6008cb06d83
+  data.tar.gz: d1cd55d8af1f209cf21490a4f587cd119d6548ad
 SHA512:
-  metadata.gz: f95ffdb35728e7c4f4fa6ab2a8da8f167ea3d77bf551da75b98b80a4c120c9e52ad852209ffb6e918bd3fb48b7d1b2b14f4396d2b07cc42e332463bd418c6193
-  data.tar.gz: 031f4a8efebfa49c4f5ce143ebd9fa7a8f01b749562121389279ffeb0b9ceab5f0dcf496021e82b9af262a93c84d795c946fca2a2701cdd71144eff3daaf110f
+  metadata.gz: 9471b130f5d5230b8346eab341ffb87f88167ba9d2b9475010e866cc0e5b172e228317f16f2ad593a3c8f7b11c5a794aec3390f8293707dad69714c84033b16e
+  data.tar.gz: 0adc7de6f975b6d7be3e863cf1acd84010fb3ac44329c03b65fa241ba74a01d29554f4e231f95724d46051e75c1f708c3b3493162fae658958d7e569ed1bd8b5

data/lib/beanpool/connections.rb

@@ -1,4 +1,5 @@
 require 'beaneater'
+require 'thread'
 
 class Beanpool
   class Connections
@@ -10,6 +11,7 @@ class Beanpool
       @connections = {}
       @debug = debug
       build_connections
+      @mutex = Mutex.new
     end
 
     def notify(object)
@@ -78,43 +80,47 @@ class Beanpool
     end
 
     def get_job_from_tube(timeout = nil, tube_name = 'default')
-      ip_id = connection_sample
-      connection = @connections[ip_id]
-      begin
-        job = connection.tubes[tube_name].reserve(timeout)
-        return job
-      rescue Beaneater::TimedOutError
-        return nil
-      rescue => ex
-        notify(ex)
-        notify("Exception IP: #{ip_id}")
-        put_ip_in_timeout_and_reload(ip_id)
-        return nil
+      @mutex.synchronize do
+        ip_id = connection_sample
+        connection = @connections[ip_id]
+        begin
+          job = connection.tubes[tube_name].reserve(timeout)
+          return job
+        rescue Beaneater::TimedOutError
+          return nil
+        rescue => ex
+          notify(ex)
+          notify("Exception IP: #{ip_id}")
+          put_ip_in_timeout_and_reload(ip_id)
+          return nil
+        end
       end
     end
 
     def put_job_to_tube(body, options)
-      options = keystring_hash(options)
-      pri = options["pri"] || 32000
-      ttr = options["ttr"] || 60
-      reset_use_tube = options['reset_use_tube']
-      tube_name = options["tube_name"] || 'default'
-      delay = (options["delay"]).to_i
+      @mutex.synchronize do
+        options = keystring_hash(options)
+        pri = options["pri"] || 32000
+        ttr = options["ttr"] || 60
+        reset_use_tube = options['reset_use_tube']
+        tube_name = options["tube_name"] || 'default'
+        delay = (options["delay"]).to_i
 
-      ip_id = connection_sample
-      connection = @connections[ip_id]
-      begin
-        notify("BEANPOOL: Putting to #{tube_name}")
-        connection.tubes[tube_name].put(body, :pri => pri, :delay => delay, :ttr => ttr)
-      rescue => ex
-        notify(ex)
-        put_ip_in_timeout_and_reload(ip_id)
         ip_id = connection_sample
         connection = @connections[ip_id]
-        connection.tubes[tube_name].put(body, :pri => pri, :delay => delay, :ttr => ttr)
+        begin
+          notify("BEANPOOL: Putting to #{tube_name}")
+          connection.tubes[tube_name].put(body, :pri => pri, :delay => delay, :ttr => ttr)
+        rescue => ex
+          notify(ex)
+          put_ip_in_timeout_and_reload(ip_id)
+          ip_id = connection_sample
+          connection = @connections[ip_id]
+          connection.tubes[tube_name].put(body, :pri => pri, :delay => delay, :ttr => ttr)
+        end
+        # Force default tube reset if requested.
+        connection.tubes.use(reset_use_tube) if connection && reset_use_tube
       end
-      # Force default tube reset if requested.
-      connection.tubes.use(reset_use_tube) if connection && reset_use_tube
     end
 
     def keystring_hash(hash)

data/lib/beanpool/version.rb

@@ -1,3 +1,3 @@
 class Beanpool
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beanpool
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Jason M.