beanpool 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39756d1320016f7c5ef3c729618c38489aa897e1
-  data.tar.gz: 2f242163e3a922cc6898be819648a05343ba4d7a
+  metadata.gz: 797cf452e255d5c593af0b924b72abad25f109b0
+  data.tar.gz: ebb47bb2be3dc39254b270fc01d6df9b3135579d
 SHA512:
-  metadata.gz: 69698c9aa7696acc46e85e43d1257ee8de887c1a64b2989627c66e8ad635728dc6cb8867e9d2ed43a1475b3a7f1d1e53fa16abd76ff39aa4b31a1369cf155673
-  data.tar.gz: 5952adb8b31f29f4561b10af8b7c637a894f32ba4b12b07025e08adf254856d762e2da3d860036a2bfc6bd53865da5f2e39ca30eb92ccfc970a52e85fd6f44f4
+  metadata.gz: d8ee79d0a40d6155f4f6d6e4ff7d51195fb1a0e0821cc0fbc7dc0480ff53035aa8a165c2cefc7202128c99c3a42da2213b5b95755e27f5cc5f69b49f757492da
+  data.tar.gz: d70822c114b114c56010d19d779c2aa3d10c46df04a8be93a78610cbbcaafcc93c72026a4f0c4f35983f1c603a91c3b030b9a148ae0b0d8a01056a1faebe41c8

data/beanpool.gemspec

@@ -23,5 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_dependency "beaneater"
+  spec.add_dependency "beaneater", "~> 1.0"
 end

data/lib/beanpool.rb

@@ -5,9 +5,9 @@ end
 class Beanpool
   attr_reader :connections
 
-  def initialize(ip_array)
+  def initialize(ip_array, debug = false)
     raise 'Beanpool must be initialized with an array of IP addresses' unless ip_array.is_a?(Array) && !ip_array.empty?
-    @connections = Beanpool::Connections.new(ip_array)
+    @connections = Beanpool::Connections.new(ip_array, debug)
   end
 
   def put(body, tube_name = 'default', pri = 32_000, ttr = 60, delay = 0)
@@ -29,6 +29,10 @@ class Beanpool
     return {}
   end
 
+  def get_stat_by_tube(tube_name, stat_name)
+    @connections.stats(tube_name,stat_name.to_sym)
+  end
+
   def get_ready_by_tube(name)
     @connections.stats(name, :current_jobs_ready)
   end

data/lib/beanpool/connections.rb

@@ -4,12 +4,31 @@ class Beanpool
   class Connections
     attr_reader :ip_array, :connections
 
-    def initialize(ip_array)
+    def initialize(ip_array, debug)
       @ip_array = ip_array
+      @troubled_ips = {}
       @connections = {}
+      @debug = debug
       build_connections
     end
 
+    def notify(object)
+      if @debug
+        if object.is_a? Exception
+          backtrace_array = object.backtrace
+          backtrace_array.reject! { |x| x =~ /\.rvm/ }
+          backtrace_array.unshift(object.message.to_s)
+          raw_string = backtrace_array.join("\n")
+          puts "EXCEPTION: #{object.message}"
+          puts raw_string
+        elsif object.is_a?(Hash) || object.is_a?(Array)
+          puts object
+        elsif object.is_a?(String)
+          puts object
+        end
+      end
+    end
+
     def build_connections
       @ip_array.each do |ip|
         raise 'Only single IP for beaneater' if ip.is_a?(Array)
@@ -23,17 +42,64 @@ class Beanpool
       end
     end
 
-    def get_job_from_tube(timeout = nil, tube_name = 'default')
+    def put_ip_in_timeout_and_reload(ip)
+      return unless @connections.size > 1
+      @troubled_ips[ip] = { time: Time.now }
+      @connections.delete(ip) unless @connections.size < 2
+      notify("Added #{ip} to troubled")
+    end
+
+    def connection_sample
+      check_times
       ip_id = @connections.keys.sample
+      ip_id
+    end
+
+    def check_times
+      @troubled_ips.each do |k, v|
+        notify("Checking troubled #{k}")
+        if v[:time] < Time.now - 60
+          begin
+            @connections[k] = Beaneater.new(k)
+            notify("Readded to live: #{k}")
+            @troubled_ips.delete(k)
+          rescue => ex
+            notify(ex)
+            # Keep retrying every minute
+            v[:time] = Time.now
+          end
+        end
+      end
+    end
+
+    def get_job_from_tube(timeout = nil, tube_name = 'default')
+      ip_id = connection_sample
       connection = @connections[ip_id]
-      job = connection.tubes[tube_name].reserve(timeout)
-      job
+      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
 
     def put_job_to_tube(body, pri = 32_000, ttr = 60, tube_name = 'default', delay = 0)
-      ip_id = @connections.keys.sample
+      ip_id = connection_sample
       connection = @connections[ip_id]
-      connection.tubes[tube_name].put(body, :pri => pri, :delay => delay, :ttr => ttr)
+      begin
+        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
     end
 
     def stats(tube_name, stat_name)

data/lib/beanpool/version.rb

@@ -1,3 +1,3 @@
 class Beanpool
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beanpool
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jason M.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-16 00:00:00.000000000 Z
+date: 2018-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,16 +56,16 @@ dependencies:
   name: beaneater
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 description: Simple pool for beanstalkd connections. Uses beaneater as underlying
   connections
 email: