rservicebus 0.0.32 → 0.0.34

data/lib/rservicebus/HandlerLoader.rb

@@ -89,11 +89,11 @@ class HandlerLoader
 # 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, appResources )
+## @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|
+		@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?
@@ -101,7 +101,7 @@ class HandlerLoader
 				@host.log "App resource attribute, #{k}, set for: " + handler.class.name
 			end
 		end
-		
+
 		return self
 	end
 
@@ -117,7 +117,7 @@ class HandlerLoader
 
 			handler = self.loadHandlerFromFile( handlerName, filePath )
 			self.setBusAttributeIfRequested( handler )
-			self.setAppResources( handler, @appResources )
+			self.setAppResources( handler )
 			@host.log "Loaded Handler: " + handlerName
 
 			return handler

data/lib/rservicebus/Host.rb

@@ -59,14 +59,14 @@ module RServiceBus
         
         def loadHandlers()
             log "Load Message Handlers"
-            handlerLoader = HandlerLoader.new( self, @appResources )
+            @handlerLoader = HandlerLoader.new( self, @appResources )
             
             @config.handlerPathList.each do |path|
-                handlerLoader.loadHandlersFromPath(path)
+                @handlerLoader.loadHandlersFromPath(path)
             end
             
-            @handlerList = handlerLoader.handlerList
-            @resourceByHandlerNameList = handlerLoader.resourceList
+            @handlerList = @handlerLoader.handlerList
+            @resourceByHandlerNameList = @handlerLoader.resourceList
             
             return self
         end
@@ -185,12 +185,13 @@ module RServiceBus
                         @handlerList[@msg.msg.class.name].each do |handler|
                             @resourceByHandlerNameList[handler.class.name].each do |resource|
                                 resource.reconnect
+                                @handlerLoader.setAppResources( handler )
                             end
                         end
-                        
-                        
+
+
                         retry if (retries -= 1) > 0
-                        
+
                         @stats.incTotalErrored
                         if e.class.name == "Beanstalk::NotConnected" then
                             puts "Lost connection to beanstalkd."
@@ -306,13 +307,16 @@ module RServiceBus
             @stats.incTotalSent
             
             msgName = msg.class.name
-            if !@config.messageEndpointMappings.has_key?( msgName ) then
+            if @config.messageEndpointMappings.has_key?( msgName ) then
+                queueName = @config.messageEndpointMappings[msgName]
+            elsif !@handlerList[msgName].nil? then
+                queueName = @config.localQueueName
+            else
                 log "No end point mapping found for: " + msgName
-                log "**** Check in RServiceBus.yml that the section MessageEndpointMappings contains an entry named : " + msgName
+                log "**** Check environment variable MessageEndpointMappings contains an entry named : " + msgName
                 raise "No end point mapping found for: " + msgName
             end
             
-            queueName = @config.messageEndpointMappings[msgName]
             
             self._SendNeedsWrapping( msg, queueName )
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.0.34
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-05 00:00:00.000000000 Z
+date: 2012-11-15 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby interpretation of NServiceBus
 email: guy@guyirvine.com