rservicebus 0.1.32 → 0.1.33

data/lib/rservicebus.rb

@@ -29,6 +29,7 @@ require "rservicebus/UserMessage/WithPayload"
 
 require "rservicebus/StateManager"
 require "rservicebus/CronManager"
+require "rservicebus/CircuitBreaker"
 
 require "rservicebus/AppResource"
 

data/lib/rservicebus/CircuitBreaker.rb

@@ -0,0 +1,100 @@
+module RServiceBus
+    
+    #Considered just holding in here when the circuit broke, but thought there may be other things the system might want
+    # to do - not that I could think of anything off the top of my head.
+    
+    class MessageArrivedWhileCricuitBroken<StandardError
+    end
+
+    #An implementation of Michael Nygard's Circuit Breaker pattern.
+    class CircuitBreaker
+
+        def reset
+            @broken = false
+
+            @numberOfFailures = 0
+            @timeOfFirstFailure = nil
+            
+            @timeToBreak = nil
+            @timeToReset = nil
+        end
+
+        def initialize( host )
+            @host = host
+            @maxNumberOfFailures = RServiceBus.getValue( "RSBCB_MAX", 5 )
+            @secondsToBreak = RServiceBus.getValue( "RSBCB_SECONDS_TO_BREAK", 60 ).to_i
+            @secondsToReset = RServiceBus.getValue( "RSBCB_SECONDS_TO_RESET", 60 ).to_i
+            @resetOnSuccess = RServiceBus.getValue( "RSBCB_RESET_ON_SUCCESS", false )
+            
+            self.reset
+        end
+        
+        ####### Public Interface
+        # Broken will be called before processing a message.
+        #  => Broken will be called before Failure
+        def Broken
+            if !@timeToReset.nil? && Time.now > @timeToReset then
+                self.reset
+            end
+
+            return @broken
+        end
+
+        def Live
+            return !self.Broken
+        end
+
+
+## This should be called less than success.
+## If there is a failure, then taking a bit longer gives time to settle.
+        def Failure
+            self.messageArrived
+
+
+            ##logFirstFailure
+            if @numberOfFailures == 0
+                @numberOfFailures = 1
+                @timeOfFirstFailure = Time.now
+                @timeToBreak = @timeOfFirstFailure + @secondsToBreak
+            else
+                @numberOfFailures = @numberOfFailures + 1
+            end
+
+
+            ##checkToBreakCircuit
+            if @numberOfFailures >= @maxNumberOfFailures then
+                self.breakCircuit
+            end
+        end
+        
+        def Success
+            if @resetOnSuccess == true then
+                self.reset
+                return
+            end
+            
+            self.messageArrived
+        end
+
+
+
+        ######
+        protected
+        
+        def messageArrived
+            if !@timeToBreak.nil? && Time.now > @timeToBreak then
+                self.reset
+            end
+            
+            raise MessageArrivedWhileCricuitBroken if @broken == true
+        end
+
+
+        def breakCircuit
+            @broken = true
+            @timeToReset = Time.now + @secondsToReset
+        end
+
+    end
+    
+end

data/lib/rservicebus/Host.rb

@@ -9,7 +9,7 @@ module RServiceBus
     end
     class PropertyNotSet<StandardError
     end
-    
+
     #Host process for rservicebus
     class Host
         
@@ -65,8 +65,14 @@ module RServiceBus
             return self;
         end
 
-        
-        
+        #Thin veneer for Configuring Cron
+        #
+        def configureCircuitBreaker
+            @circuitBreaker = CircuitBreaker.new( self )
+            return self;
+        end
+
+
         #Thin veneer for Configuring external resources
         #
         def configureMonitors
@@ -166,6 +172,7 @@ module RServiceBus
 			.configureAppResource()
             .configureStateManager()
             .configureCronManager()
+            .configureCircuitBreaker()
 			.configureMonitors()
 			.loadHandlers()
 			.connectToMq()
@@ -200,7 +207,7 @@ module RServiceBus
             statOutputCountdown = 0
             messageLoop = true
             retries = @config.maxRetries
-            
+
             while messageLoop do
                 #Popping a msg off the queue should not be in the message handler, as it affects retry
                 begin
@@ -212,6 +219,11 @@ module RServiceBus
                     end
                     statOutputCountdown = statOutputCountdown - 1
                     
+                    if @circuitBreaker.Broken then
+                        sleep 0.5
+                        next
+                    end
+                    
                     body = @mq.pop
                     begin
                         @stats.incTotalProcessed
@@ -264,6 +276,8 @@ module RServiceBus
                             @mq.returnToQueue
                             else
                             
+                            @circuitBreaker.Failure
+
                             @stats.incTotalErrored
                             if e.class.name == "Beanstalk::NotConnected" then
                                 puts "Lost connection to beanstalkd."
@@ -302,10 +316,13 @@ module RServiceBus
                     @queueForMsgsToBeSentOnComplete = nil
                     
                     @queueForMsgsToBeSentOnComplete = Array.new
-		    @cronManager.Run
+                    @cronManager.Run
                     self.sendQueuedMsgs
                     @queueForMsgsToBeSentOnComplete = nil
                     
+                    
+                    @circuitBreaker.Success
+                    
                     rescue Exception => e
                     if e.message == "SIGTERM" then
                         puts "Exiting on request ..."

data/lib/rservicebus/helper_functions.rb

@@ -15,6 +15,8 @@ module RServiceBus
 	end
 
 	def RServiceBus.log(string, ver=false)
+        return unless ENV['TESTING'].nil?
+        
 		type = ver ? "VERB" : "INFO"
         #		if @config.verbose || !ver then
         timestamp = Time.new.strftime( "%Y-%m-%d %H:%M:%S" )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus
 version: !ruby/object:Gem::Version
-  version: 0.1.32
+  version: 0.1.33
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &70245751164860 !ruby/object:Gem::Requirement
+  requirement: &70168920560860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70245751164860
+  version_requirements: *70168920560860
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70245751163360 !ruby/object:Gem::Requirement
+  requirement: &70168920555700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70245751163360
+  version_requirements: *70168920555700
 - !ruby/object:Gem::Dependency
   name: beanstalk-client
-  requirement: &70245751178000 !ruby/object:Gem::Requirement
+  requirement: &70168920924560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70245751178000
+  version_requirements: *70168920924560
 - !ruby/object:Gem::Dependency
   name: fluiddb
-  requirement: &70245751176680 !ruby/object:Gem::Requirement
+  requirement: &70168920923940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70245751176680
+  version_requirements: *70168920923940
 - !ruby/object:Gem::Dependency
   name: parse-cron
-  requirement: &70245751175200 !ruby/object:Gem::Requirement
+  requirement: &70168920923200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70245751175200
+  version_requirements: *70168920923200
 description: A Ruby interpretation of NServiceBus
 email: guy@guyirvine.com
 executables:
@@ -95,6 +95,7 @@ files:
 - lib/rservicebus/AppResource/SmbFile.rb
 - lib/rservicebus/AppResource.rb
 - lib/rservicebus/Audit.rb
+- lib/rservicebus/CircuitBreaker.rb
 - lib/rservicebus/Config.rb
 - lib/rservicebus/ConfigureAppResource.rb
 - lib/rservicebus/ConfigureMonitor.rb