rservicebus 0.0.59 → 0.0.60

data/lib/rservicebus.rb

@@ -11,6 +11,7 @@ require "uri"
 require "rservicebus/helper_functions"
 require "rservicebus/ErrorMessage"
 require "rservicebus/HandlerLoader"
+require "rservicebus/HandlerManager"
 require "rservicebus/ConfigureAppResource"
 require "rservicebus/ConfigureMQ"
 require "rservicebus/Host"

data/lib/rservicebus/AppResource.rb

@@ -25,7 +25,9 @@ module RServiceBus
         # @param [String] uri a location for the resource to which we will attach, eg redis://127.0.0.1/foo
         def initialize( uri )
             @uri = uri
+            #Do a connect / disconnect loop on startup to validate the connection
             self._connect
+            self.finished
         end
 
         # The method which actually configures the resource.

data/lib/rservicebus/HandlerLoader.rb

@@ -6,10 +6,7 @@ module RServiceBus
 #	loading handlers
 class HandlerLoader
 
-	attr_reader :handlerList, :resourceList
-
-	@host
-	@appResources
+	attr_reader :handlerList
 
 	@baseDir
 	@filepath
@@ -21,7 +18,6 @@ class HandlerLoader
 	@handler
 
 	@handlerList
-    @resourceList
     
     @listOfLoadedPaths
 
@@ -29,12 +25,10 @@ class HandlerLoader
 #
 # @param [RServiceBus::Host] host instance
 # @param [Hash] appResources As hash[k,v] where k is the name of a resource, and v is the resource
-	def initialize( host, appResources )
-		@host = host
-		@appResources = appResources
-		
-		@handlerList = Hash.new
-        @resourceList = Hash.new
+	def initialize( host, handlerManager )
+        @host = host
+        
+		@handlerManager = handlerManager
         
         @listOfLoadedPaths = Hash.new
 	end
@@ -78,43 +72,12 @@ class HandlerLoader
 		return handler
 	end
 	
-# setBusAttributeIfRequested
-#
-# @param [RServiceBus::Handler] handler
-	def setBusAttributeIfRequested( handler )
-		if defined?( handler.Bus ) then
-			handler.Bus = @host
-			@host.log "Bus attribute set for: " + handler.class.name
-		end
-		
-		return self
-	end
-
-# Assigns appropriate resources to writable attributes in the handler that match keys in the resource hash
-#
-# @param [RServiceBus::Handler] handler
-## @param [Hash] appResources As hash[k,v] where k is the name of a resource, and v is the resource
-	def setAppResources( handler )
-		@host.log "Checking app resources for: #{handler.class.name}", true
-		@host.log "If your attribute is not getting set, check that it is in the 'attr_accessor' list", true
-		@appResources.each do |k,v|
-			if handler.class.method_defined?( k ) then
-				handler.instance_variable_set( "@#{k}", v.getResource() )
-                @resourceList[handler.class.name] = Array.new if @resourceList[handler.class.name].nil?
-                @resourceList[handler.class.name] << v
-				@host.log "App resource attribute, #{k}, set for: " + handler.class.name
-			end
-		end
-
-		return self
-	end
-
 # Wrapper function
 #
 # @param [String] filePath
 # @param [String] handlerName
 # @returns [RServiceBus::Handler] handler
-	def loadAndConfigureHandler(msgName, filePath, handlerName)
+	def loadHandler(msgName, filePath, handlerName)
         if @listOfLoadedPaths.has_key?( filePath ) then
             @host.log "Not reloading, #{filePath}"
             return
@@ -125,12 +88,9 @@ class HandlerLoader
 			@host.log "handlerName: " + handlerName, true
 
 			handler = self.loadHandlerFromFile( handlerName, filePath )
-			self.setBusAttributeIfRequested( handler )
-			self.setAppResources( handler )
 			@host.log "Loaded Handler: " + handlerName
 
-            @handlerList[msgName] = Array.new unless @handlerList.has_key?( msgName )
-            @handlerList[msgName] << handler;
+            @handlerManager.addHandler( msgName, handler )
             
             @listOfLoadedPaths[filePath] = 1
 		rescue Exception => e
@@ -167,7 +127,7 @@ class HandlerLoader
 					fileName = File.basename( filePath ).sub( ".rb", "" )
 					handlerName = "MessageHandler_#{msgName}_#{fileName}"
 
-					self.loadAndConfigureHandler( msgName, filePath, handlerName )
+					self.loadHandler( msgName, filePath, handlerName )
 				end
 			end
 		end
@@ -201,7 +161,7 @@ class HandlerLoader
 					self.loadHandlersFromSecondLevelPath( msgName, filePath )
 				else
 					handlerName = "MessageHandler_#{msgName}"
-					self.loadAndConfigureHandler( msgName, filePath, handlerName )
+					self.loadHandler( msgName, filePath, handlerName )
 				end
 			end
 		end

data/lib/rservicebus/HandlerManager.rb

@@ -0,0 +1,145 @@
+module RServiceBus
+    
+    #Given a directory, this class is responsible for finding
+    #	msgnames,
+    #	handlernames, and
+    #	loading handlers
+    class HandlerManager
+        
+        # Constructor
+        #
+        # @param [RServiceBus::Host] host instance
+        # @param [Hash] appResources As hash[k,v] where k is the name of a resource, and v is the resource
+        def initialize( host, appResources )
+            @host = host
+            @appResources = appResources
+            
+            @handlerList = Hash.new
+            @resourceListByHandlerName = Hash.new
+        end
+        
+        
+        # setBusAttributeIfRequested
+        #
+        # @param [RServiceBus::Handler] handler
+        def setBusAttributeIfRequested( handler )
+            if defined?( handler.Bus ) then
+                handler.Bus = @host
+                @host.log "Bus attribute set for: " + handler.class.name
+            end
+            
+            return self
+        end
+
+        def interrogateHandlerForAppResources( handler )
+            @host.log "Checking app resources for: #{handler.class.name}", true
+            @host.log "If your attribute is not getting set, check that it is in the 'attr_accessor' list", true
+            
+            @resourceListByHandlerName[handler.class.name] = Array.new
+            @appResources.each do |k,v|
+                if handler.class.method_defined?( k ) then
+                    @resourceListByHandlerName[handler.class.name] << k
+                    @host.log "Resource attribute, #{k}, found for: " + handler.class.name
+                end
+            end
+            
+            return self
+        end
+        
+        def addHandler( msgName, handler )
+            #        @handlerList[msgName] = Array.new unless @handlerList.has_key?( msgName )
+            @handlerList[msgName] = Array.new if @handlerList[msgName].nil?
+            @handlerList[msgName] << handler
+            
+            self.setBusAttributeIfRequested( handler )
+            self.interrogateHandlerForAppResources( handler )
+        end
+        
+        # Assigns appropriate resources to writable attributes in the handler that match keys in the resource hash
+        #
+        # @param [RServiceBus::Handler] handler
+        ## @param [Hash] appResources As hash[k,v] where k is the name of a resource, and v is the resource
+        def setAppResources( handler )
+            @host.log "Checking app resources for: #{handler.class.name}", true
+            @host.log "If your attribute is not getting set, check that it is in the 'attr_accessor' list", true
+            @appResources.each do |k,v|
+                if handler.class.method_defined?( k ) then
+                    v._connect
+                    v.Begin
+                    handler.instance_variable_set( "@#{k}", v.getResource() )
+                    @host.log "App resource attribute, #{k}, set for: " + handler.class.name
+                end
+            end
+            
+            return self
+        end
+        
+        def getListOfResourcesNeededToProcessMsg( msgName )
+            list = Array.new
+            @handlerList[msgName].each do |handler|
+                list = list + @resourceListByHandlerName[handler.class.name] unless @resourceListByHandlerName[handler.class.name].nil?
+            end
+            list.uniq!
+            
+            return list
+        end
+        
+        def setResourcesForHandlersNeededToProcessMsg( msgName )
+            @handlerList[msgName].each do |handler|
+                next if @resourceListByHandlerName[handler.class.name].nil?
+                @resourceListByHandlerName[handler.class.name].each do |k|
+                    handler.instance_variable_set( "@#{k}", @appResources[k].getResource() )
+                    @host.log "App resource attribute, #{k}, set for: " + handler.class.name
+                end
+            end
+            
+        end
+        
+        def getHandlerListForMsg( msgName )
+            raise NoHandlerFound.new( msgName ) if @handlerList[msgName].nil?
+
+            list = self.getListOfResourcesNeededToProcessMsg( msgName )
+            list.each do |resourceName|
+                @host.log( "Preparing reousrce: #{resourceName}", true )
+                r = @appResources[resourceName]
+                r._connect
+                r.Begin
+            end
+            
+            self.setResourcesForHandlersNeededToProcessMsg( msgName )
+            
+            return @handlerList[msgName]
+        end
+        
+        def commitResourcesUsedToProcessMsg( msgName )
+            list = self.getListOfResourcesNeededToProcessMsg( msgName )
+            list.each do |resourceName|
+                    r = @appResources[resourceName]
+                    r.Commit
+            end
+        end
+        
+        def rollbackResourcesUsedToProcessMsg( msgName )
+            @host.log "HandlerManager.rollbackResourcesUsedToProcessMsg, #{msgName}", true
+            list = self.getListOfResourcesNeededToProcessMsg( msgName )
+            list.each do |resourceName|
+                begin
+                    r = @appResources[resourceName]
+                    @host.log "Rollback resource, #{r.class.name}", true
+                    r.Rollback
+                    rescue Exception => e1
+                    @host.log "Caught nested exception rolling back, #{r.class.name}, for msg, #{msgName}"
+                    @host.log "****"
+                    @host.log e1.message
+                    @host.log e.backtrace
+                    @host.log "****"
+                end
+            end
+            
+        end
+        
+        def canMsgBeHandledLocally( msgName )
+            return @handlerList.has_key?(msgName)
+        end
+    end
+end

data/lib/rservicebus/Host.rb

@@ -12,7 +12,7 @@ module RServiceBus
     class Host
         
         @handlerList
-        @resourceByHandlerNameList
+        @resourceListByHandlerName
         
         @subscriptions
         
@@ -84,15 +84,13 @@ module RServiceBus
         #
         def loadHandlers()
             log "Load Message Handlers"
-            @handlerLoader = HandlerLoader.new( self, @appResources )
+            @handlerManager = HandlerManager.new( self, @appResources )
+            @handlerLoader = HandlerLoader.new( self, @handlerManager )
             
             @config.handlerPathList.each do |path|
                 @handlerLoader.loadHandlersFromPath(path)
             end
             
-            @handlerList = @handlerLoader.handlerList
-            @resourceByHandlerNameList = @handlerLoader.resourceList
-            
             return self
         end
         
@@ -115,7 +113,7 @@ module RServiceBus
             log "Load Libs"
             
             @config.libList.each do |path|
-$:.unshift path
+                $:.unshift path
                 if Dir.exists?( path ) then
                     path = path.strip.chomp( "/" )
                     path = path + "/**/*.rb"
@@ -197,11 +195,11 @@ $:.unshift path
                 #Popping a msg off the queue should not be in the message handler, as it affects retry
                 begin
                     if statOutputCountdown == 0 then
-                        #                        log @stats.getForReporting
-                        statOutputCountdown = @config.statOutputCountdown-1
-                        else
-                        statOutputCountdown = statOutputCountdown - 1
+                        log @stats.getForReporting
+                        statOutputCountdown = @config.statOutputCountdown
                     end
+                    statOutputCountdown = statOutputCountdown - 1
+                    
                     body = @mq.pop
                     begin
                         @stats.incTotalProcessed
@@ -217,21 +215,21 @@ $:.unshift path
                         end
                         @mq.ack
                         rescue ClassNotFoundForMsg => e
-                            puts "*** Class not found for msg, #{e.message}"
-                            puts "*** Ensure, #{e.message}, is defined in Contract.rb, most likely as 'Class #{e.message} end"
+                        puts "*** Class not found for msg, #{e.message}"
+                        puts "*** Ensure, #{e.message}, is defined in Contract.rb, most likely as 'Class #{e.message} end"
                         
-                            @msg.addErrorMsg( @config.localQueueName, e.message )
-                            serialized_object = YAML::dump(@msg)
-                            self._SendAlreadyWrappedAndSerialised(serialized_object, @config.errorQueueName)
-                            @mq.ack
+                        @msg.addErrorMsg( @config.localQueueName, e.message )
+                        serialized_object = YAML::dump(@msg)
+                        self._SendAlreadyWrappedAndSerialised(serialized_object, @config.errorQueueName)
+                        @mq.ack
                         rescue NoHandlerFound => e
-                            puts "*** Handler not found for msg, #{e.message}"
-                            puts "*** Ensure a handler named, #{e.message}, is present in the MessageHandler directory."
+                        puts "*** Handler not found for msg, #{e.message}"
+                        puts "*** Ensure a handler named, #{e.message}, is present in the MessageHandler directory."
                         
-                            @msg.addErrorMsg( @config.localQueueName, e.message )
-                            serialized_object = YAML::dump(@msg)
-                            self._SendAlreadyWrappedAndSerialised(serialized_object, @config.errorQueueName)
-                            @mq.ack
+                        @msg.addErrorMsg( @config.localQueueName, e.message )
+                        serialized_object = YAML::dump(@msg)
+                        self._SendAlreadyWrappedAndSerialised(serialized_object, @config.errorQueueName)
+                        @mq.ack
                         rescue Exception => e
                         sleep 0.5
                         
@@ -240,22 +238,6 @@ $:.unshift path
                         puts e.backtrace
                         puts "***"
                         
-                        tempHandlerList = Hash.new
-                        tempResourceList = Hash.new
-                        puts @msg.to_s
-                        puts @msg.msg.to_s
-                        puts @msg.msg.class.to_s
-                        puts @msg.msg.class.name
-                        
-                        @handlerList[@msg.msg.class.name].each do |handler|
-                            tempHandlerList[handler.class.name] = handler
-                            @resourceByHandlerNameList[handler.class.name].each do |resource|
-                                tempResourceList[resource.class.name] = resource
-                            end
-                        end
-                        tempResourceList.each {|k,resource| resource.reconnect }
-                        tempHandlerList.each {|k,handler| @handlerLoader.setAppResources( handler ) }
-                        
                         if retries > 0 then
                             retries = retries - 1
                             @mq.returnToQueue
@@ -315,61 +297,32 @@ $:.unshift path
             #
             def HandleMessage()
                 msgName = @msg.msg.class.name
-                handlerList = @handlerList[msgName]
+                handlerList = @handlerManager.getHandlerListForMsg(msgName)
                 
-                if handlerList == nil then
-                    raise NoHandlerFound.new( msgName )
+                log "Handler found for: " + msgName, true
+                begin
+                    @queueForMsgsToBeSentOnComplete = Array.new
                     
-                    else
-                    log "Handler found for: " + msgName, true
-                    log "Prep app resources", true
-                    tempResourceList = Hash.new
                     handlerList.each do |handler|
-                        if !@resourceByHandlerNameList[handler.class.name].nil? then
-                            @resourceByHandlerNameList[handler.class.name].each do |resource|
-                                tempResourceList[resource.class.name] = resource
-                            end
+                        begin
+                            handler.Handle( @msg.msg )
+                            rescue Exception => e
+                            puts "E #{e.message}"
+                            log "An error occured in Handler: " + handler.class.name
+                            raise e
                         end
                     end
-                    begin
-                        @queueForMsgsToBeSentOnComplete = Array.new
-                        
-                        tempResourceList.each do |name, resource|
-                            log "Prep resource, #{name}", true
-                            resource.Begin
-                        end
-                        
-                        handlerList.each do |handler|
-                            begin
-                                handler.Handle( @msg.msg )
-                                rescue Exception => e
-                                puts "E #{e.message}"
-                                log "An error occured in Handler: " + handler.class.name
-                                raise e
-                            end
-                        end
-                        
-                        tempResourceList.each do |name, resource|
-                            log "Commit resource, #{name}", true
-                            resource.Commit
-                        end
-                        
-                        self.sendQueuedMsgs
-                        
-                        rescue Exception => e
-                        
-                        tempResourceList.each do |name, resource|
-                            log "Rollback resource, #{name}", true
-                            begin
-                                resource.Rollback
-                                rescue Exception => e1
-                                log "Nested exception rolling back, #{resource.class.name}, for msg, #{msgName}"
-                            end
-                        end
-                        @queueForMsgsToBeSentOnComplete = nil
-                        
-                        raise e
-                    end
+                    
+                    @handlerManager.commitResourcesUsedToProcessMsg( msgName )
+                    
+                    self.sendQueuedMsgs
+                    
+                    rescue Exception => e
+                    
+                    @handlerManager.rollbackResourcesUsedToProcessMsg( msgName )
+                    @queueForMsgsToBeSentOnComplete = nil
+                    
+                    raise e
                 end
             end
             
@@ -430,11 +383,11 @@ $:.unshift path
             def Send( msg )
                 log "Bus.Send", true
                 @stats.incTotalSent
-                
+
                 msgName = msg.class.name
                 if @config.messageEndpointMappings.has_key?( msgName ) then
                     queueName = @config.messageEndpointMappings[msgName]
-                    elsif !@handlerList[msgName].nil? then
+                    elsif @handlerManager.canMsgBeHandledLocally(msgName) then
                     queueName = @config.localQueueName
                     else
                     log "No end point mapping found for: " + msgName

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus
 version: !ruby/object:Gem::Version
-  version: 0.0.59
+  version: 0.0.60
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-25 00:00:00.000000000 Z
+date: 2013-04-30 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby interpretation of NServiceBus
 email: guy@guyirvine.com
@@ -42,6 +42,7 @@ files:
 - lib/rservicebus/ConfigureSubscriptionStorage.rb
 - lib/rservicebus/ErrorMessage.rb
 - lib/rservicebus/HandlerLoader.rb
+- lib/rservicebus/HandlerManager.rb
 - lib/rservicebus/helper_functions.rb
 - lib/rservicebus/Host.rb
 - lib/rservicebus/Message/Subscription.rb