bosh_common 1.2641.0 → 1.2652.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d28e22d3c46e0a9b7b28d6fe6dca3ee4049621a
-  data.tar.gz: 10c2112afe5201e39a4e02d7a3d6e2e93649500b
+  metadata.gz: 9a699a5bce247048d9a803c1ab8268b40e787871
+  data.tar.gz: 88d8d7150bc04ec1a18d1b90ebe2fabc2d4c0025
 SHA512:
-  metadata.gz: cebb007e17d2d841fccb9ed2ea8a89bf2e2cacaa9a4c6cc799763063dd45d397091086b1d1d3d52962f8a036df66eeb6431a037840142a0da8f2663eaa5f3e02
-  data.tar.gz: 7cd9dd1f6ca657c4e3601998089a0cb2945be79fcd3a4e1a4221925ef3890699b2bc099b0d84277f3a0af1e7397f348e007eb0ef8558655707c75d33d8db4d49
+  metadata.gz: f52497b5219a4ddfffb91880fd5d533bc5f23a9fdf6db76697e85272c33ad889484c746d65fdfd094c76ff79ae2a086e0fe9b7b96d39d36ca47fcd4985bb302f
+  data.tar.gz: 8871fbec389398907aeda81d0e9a2d7a2bc4d165483d3d2ef3d6917e018ce9722123154c64f3cd5aafec5b755c5658d5ff880e0a8e05640fe216f221d9e564c5

data/lib/common/retryable.rb

@@ -7,24 +7,32 @@ module Bosh
 
       @ensure_callback = opts[:ensure]
       @matching        = opts[:matching]
-      @on_exception    = [opts[:on]].flatten
       @try_count       = 0
       @retry_exception = nil
       @retry_limit     = opts[:tries]
       @sleeper         = opts[:sleep]
+
+      @matchers = Array(opts[:on]).map do |klass_or_matcher|
+        if klass_or_matcher.is_a?(Class)
+          ErrorMatcher.by_class(klass_or_matcher)
+        else
+          klass_or_matcher
+        end
+      end
     end
 
-    # this method will loop until the block returns a true value
-    def retryer(&block)
+    # Loops until the block returns a true value
+    def retryer(&blk)
       loop do
         @try_count += 1
-        y = yield @try_count, @retry_exception
-        @retry_exception = nil  # no exception was raised in the block
+        y = blk.call(@try_count, @retry_exception)
+        @retry_exception = nil # no exception was raised in the block
         return y if y
         raise Bosh::Common::RetryCountExceeded if @try_count >= @retry_limit
         wait
       end
-    rescue *@on_exception => exception
+    rescue Exception => exception
+      raise unless @matchers.any? { |m| m.matches?(exception) }
       raise unless exception.message =~ @matching
       raise if @try_count >= @retry_limit
 
@@ -41,7 +49,6 @@ module Bosh
       merged_options = default_options.merge(options)
       invalid_options = merged_options.keys - default_options.keys
       raise ArgumentError.new("Invalid options: #{invalid_options.join(", ")}") unless invalid_options.empty?
-
       merged_options
     end
 
@@ -51,13 +58,14 @@ module Bosh
         sleep: exponential_sleeper,
         on: [],
         matching: /.*/,
-        ensure: Proc.new {}
+        ensure: Proc.new {},
       }
     end
 
     def wait
       sleep(@sleeper.respond_to?(:call) ? @sleeper.call(@try_count, @retry_exception) : @sleeper)
-    rescue *@on_exception
+    rescue Exception => exception
+      raise unless @matchers.any? { |m| m.matches?(exception) }
       # SignalException could be raised while sleeping, so if you want to catch it,
       # it need to be passed in the list of exceptions to ignore
     end
@@ -69,6 +77,20 @@ module Bosh
     def sleep(*args, &blk)
       Kernel.sleep(*args, &blk)
     end
+
+    class ErrorMatcher
+      def self.by_class(klass)
+        new(klass, /.*/)
+      end
+
+      def initialize(klass, message_regex)
+        @klass = klass
+        @message_regex = message_regex
+      end
+
+      def matches?(error)
+        !!(error.kind_of?(@klass) && error.message =~ @message_regex)
+      end
+    end
   end
 end
-

data/lib/common/thread_pool.rb

@@ -1,4 +1,4 @@
-require "logger"
+require 'logger'
 
 module Bosh
   class ThreadPool
@@ -45,14 +45,14 @@ module Bosh
         @actions << block
         if @state == :open
           if @available_threads > 0
-            @logger.debug("Creating new thread")
+            @logger.debug('Creating new thread')
             @available_threads -= 1
             create_thread
           else
-            @logger.debug("All threads are currently busy, queuing action")
+            @logger.debug('All threads are currently busy, queuing action')
           end
         elsif @state == :paused
-          @logger.debug("Pool is paused, queueing action.")
+          @logger.debug('Pool is paused, queueing action')
         end
       end
     end
@@ -64,10 +64,8 @@ module Bosh
             action = nil
             @lock.synchronize do
               action = @actions.shift unless @boom
-              if action
-                @logger.debug("Found an action that needs to be processed")
-              else
-                @logger.debug("Thread is no longer needed, cleaning up")
+              unless action
+                @logger.debug('Thread is no longer needed, cleaning up')
                 @available_threads += 1
                 @threads.delete(thread) if @state == :open
               end
@@ -103,7 +101,7 @@ module Bosh
     end
 
     def wait
-      @logger.debug("Waiting for tasks to complete")
+      @logger.debug('Waiting for tasks to complete')
       @lock.synchronize do
         @cv.wait(@lock) while working?
         raise @boom if @boom
@@ -112,7 +110,7 @@ module Bosh
 
     def shutdown
       return if @state == :closed
-      @logger.debug("Shutting down pool")
+      @logger.debug('Shutting down pool')
       @lock.synchronize do
         return if @state == :closed
         @state = :closed

data/lib/common/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Common
-    VERSION = '1.2641.0'
+    VERSION = '1.2652.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_common
 version: !ruby/object:Gem::Version
-  version: 1.2641.0
+  version: 1.2652.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-11 00:00:00.000000000 Z
+date: 2014-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semi_semantic
@@ -26,7 +26,7 @@ dependencies:
         version: 1.1.0
 description: |-
   BOSH common
-  23fe6f
+  43d2e8
 email: support@cloudfoundry.com
 executables: []
 extensions: []