rservicebus 0.0.39 → 0.0.40

data/lib/rservicebus/Host.rb

@@ -6,16 +6,16 @@ module RServiceBus
     
     #Host process for rservicebus
     class Host
-
+        
         @handlerList
         @resourceByHandlerNameList
-
+        
         @subscriptions
-
+        
         @mq
-
+        
         @appResources
-
+        
         @config
         
         @subscriptionManager
@@ -34,13 +34,13 @@ module RServiceBus
             @appResources = ConfigureAppResource.new.getResources( ENV )
             return self;
         end
-
+        
         def connectToMq
             @mq = ConfigureMQ.new.get( @config.mqHost + "/" + @config.localQueueName, @config.queueTimeout )
-
+            
             return self
         end
-
+        
         #Subscriptions are specified by adding events to the
         #msg endpoint mapping
         def sendSubscriptions
@@ -100,7 +100,7 @@ module RServiceBus
         def configureSubscriptions
             subscriptionStorage = ConfigureSubscriptionStorage.new.get( @config.appName, @config.subscriptionUri )
             @subscriptionManager = SubscriptionManager.new( subscriptionStorage )
-
+            
             return self
         end
         
@@ -121,7 +121,7 @@ module RServiceBus
 			.loadHandlerPathList()
             .loadLibs()
             .loadWorkingDirList();
-
+            
             self.configureStatistics()
 			.configureAppResource()
 			.connectToMq()
@@ -151,9 +151,9 @@ module RServiceBus
             log "Waiting for messages. To exit press CTRL+C"
             statOutputCountdown = 0
             messageLoop = true
-
+            retries = @config.maxRetries
+            
             while messageLoop do
-                retries = @config.maxRetries
                 #Popping a msg off the queue should not be in the message handler, as it affects retry
                 begin
                     if statOutputCountdown == 0 then
@@ -178,10 +178,10 @@ module RServiceBus
                         @mq.ack
                         rescue Exception => e
                         sleep 0.5
-
+                        
                         puts e.message
                         puts e.backtrace
-
+                        
                         tempHandlerList = Hash.new
                         tempResourceList = Hash.new
                         @handlerList[@msg.msg.class.name].each do |handler|
@@ -192,167 +192,171 @@ module RServiceBus
                         end
                         tempResourceList.each {|k,resource| resource.reconnect }
                         tempHandlerList.each {|k,handler| @handlerLoader.setAppResources( handler ) }
-
-
-                        retry if (retries -= 1) > 0
-
-                        @stats.incTotalErrored
-                        if e.class.name == "Beanstalk::NotConnected" then
-                            puts "Lost connection to beanstalkd."
-                            puts "*** Start or Restart beanstalkd and try again."
-                            abort();
-                        end
-                        
-                        if e.class.name == "Redis::CannotConnectError" then
-                            puts "Lost connection to redis."
-                            puts "*** Start or Restart redis and try again."
-                            abort();
+ 
+                        if retries > 0 then
+                            retries = retries - 1
+                            @mq.returnToQueue
+                            else
+                            
+                            @stats.incTotalErrored
+                            if e.class.name == "Beanstalk::NotConnected" then
+                                puts "Lost connection to beanstalkd."
+                                puts "*** Start or Restart beanstalkd and try again."
+                                abort();
+                            end
+                            
+                            if e.class.name == "Redis::CannotConnectError" then
+                                puts "Lost connection to redis."
+                                puts "*** Start or Restart redis and try again."
+                                abort();
+                            end
+                            
+                            errorString = e.message + ". " + e.backtrace.join( ". " )
+                            log errorString
+                            
+                            @msg.addErrorMsg( @config.localQueueName, errorString )
+                            serialized_object = YAML::dump(@msg)
+                            self._SendAlreadyWrappedAndSerialised(serialized_object, @config.errorQueueName)
+                            @mq.ack
+                            retries = @config.maxRetries
                         end
-                        
-                        errorString = e.message + ". " + e.backtrace.join( ". " )
-                        log errorString
-                        
-                        @msg.addErrorMsg( @config.localQueueName, errorString )
-                        serialized_object = YAML::dump(@msg)
-                        self._SendAlreadyWrappedAndSerialised(serialized_object, @config.errorQueueName)
-                        @mq.ack
                     end
                     rescue SystemExit, Interrupt
                     puts "Exiting on request ..."
                     messageLoop = false
-
+                    
                     rescue NoMsgToProcess => e
                     #This exception is just saying there are no messages to process
                     statOutputCountdown = 0
                     rescue Exception => e
                     if e.message == "SIGTERM" then
-                    puts "Exiting on request ..."
-                    messageLoop = false
-                    else
-                    puts "*** This is really unexpected."
-                    messageLoop = false
-                    puts "Message: " + e.message
-                    puts e.backtrace
+                        puts "Exiting on request ..."
+                        messageLoop = false
+                        else
+                        puts "*** This is really unexpected."
+                        messageLoop = false
+                        puts "Message: " + e.message
+                        puts e.backtrace
+                    end
                 end
             end
             end
-        end
-        
-        #Send the current msg to the appropriate handlers
-        def HandleMessage()
-            msgName = @msg.msg.class.name
-            handlerList = @handlerList[msgName]
             
-            if handlerList == nil then
-                log "No handler found for: " + msgName
-                puts "No handler found for: " + msgName
-                puts YAML::dump(@msg)
-                raise "No Handler Found"
-                else
-                log "Handler found for: " + msgName, true
-                handlerList.each do |handler|
-                    begin
-                        handler.Handle( @msg.msg )
-                        rescue Exception => e
-                        log "An error occured in Handler: " + handler.class.name
-                        log e.message + ". " + e.backtrace[0]
-                        raise e
+            #Send the current msg to the appropriate handlers
+            def HandleMessage()
+                msgName = @msg.msg.class.name
+                handlerList = @handlerList[msgName]
+                
+                if handlerList == nil then
+                    log "No handler found for: " + msgName
+                    puts "No handler found for: " + msgName
+                    puts YAML::dump(@msg)
+                    raise "No Handler Found"
+                    else
+                    log "Handler found for: " + msgName, true
+                    handlerList.each do |handler|
+                        begin
+                            handler.Handle( @msg.msg )
+                            rescue Exception => e
+                            log "An error occured in Handler: " + handler.class.name
+                            log e.message + ". " + e.backtrace[0]
+                            raise e
+                        end
                     end
                 end
             end
-        end
-        
-        #Sends a msg across the bus
-        #
-        # @param [String] serialized_object serialized RServiceBus::Message
-        # @param [String] queueName endpoint to which the msg will be sent
-        def _SendAlreadyWrappedAndSerialised( serialized_object, queueName )
-            log "Bus._SendAlreadyWrappedAndSerialised", true
             
-            if !@config.forwardSentMessagesTo.nil? then
-                @mq.send( @config.forwardSentMessagesTo, serialized_object )
+            #Sends a msg across the bus
+            #
+            # @param [String] serialized_object serialized RServiceBus::Message
+            # @param [String] queueName endpoint to which the msg will be sent
+            def _SendAlreadyWrappedAndSerialised( serialized_object, queueName )
+                log "Bus._SendAlreadyWrappedAndSerialised", true
+                
+                if !@config.forwardSentMessagesTo.nil? then
+                    @mq.send( @config.forwardSentMessagesTo, serialized_object )
+                end
+                
+                @mq.send( queueName, serialized_object )
             end
             
-            @mq.send( queueName, serialized_object )
-        end
-        
-        #Sends a msg across the bus
-        #
-        # @param [RServiceBus::Message] msg msg to be sent
-        # @param [String] queueName endpoint to which the msg will be sent
-        def _SendNeedsWrapping( msg, queueName )
-            log "Bus._SendNeedsWrapping", true
-            
-            rMsg = RServiceBus::Message.new( msg, @config.localQueueName )
-            serialized_object = YAML::dump(rMsg)
-            log "Sending: " + msg.class.name + " to: " + queueName, true
-            self._SendAlreadyWrappedAndSerialised( serialized_object, queueName )
-        end
-        
-        #Sends a msg back across the bus
-        #Reply queues are specified in each msg. It works like
-        #email, where the reply address can actually be anywhere
-        #
-        # @param [RServiceBus::Message] msg msg to be sent
-        def Reply( msg )
-            log "Reply with: " + msg.class.name + " To: " + @msg.returnAddress, true
-            @stats.incTotalReply
-            
-            self._SendNeedsWrapping( msg, @msg.returnAddress )
-        end
-        
-        
-        #Send a msg across the bus
-        #msg destination is specified at the infrastructure level
-        #
-        # @param [RServiceBus::Message] msg msg to be sent
-        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
-                queueName = @config.localQueueName
-            else
-                log "No end point mapping found for: " + msgName
-                log "**** Check environment variable MessageEndpointMappings contains an entry named : " + msgName
-                raise "No end point mapping found for: " + msgName
+            #Sends a msg across the bus
+            #
+            # @param [RServiceBus::Message] msg msg to be sent
+            # @param [String] queueName endpoint to which the msg will be sent
+            def _SendNeedsWrapping( msg, queueName )
+                log "Bus._SendNeedsWrapping", true
+                
+                rMsg = RServiceBus::Message.new( msg, @config.localQueueName )
+                serialized_object = YAML::dump(rMsg)
+                log "Sending: " + msg.class.name + " to: " + queueName, true
+                self._SendAlreadyWrappedAndSerialised( serialized_object, queueName )
             end
             
-            
-            self._SendNeedsWrapping( msg, queueName )
-        end
-        
-        #Sends an event to all subscribers across the bus
-        #
-        # @param [RServiceBus::Message] msg msg to be sent
-        def Publish( msg )
-            log "Bus.Publish", true
-            @stats.incTotalPublished
-            
-            subscriptions = @subscriptionManager.get(msg.class.name)
-            subscriptions.each do |subscriber|
-                self._SendNeedsWrapping( msg, subscriber )
+            #Sends a msg back across the bus
+            #Reply queues are specified in each msg. It works like
+            #email, where the reply address can actually be anywhere
+            #
+            # @param [RServiceBus::Message] msg msg to be sent
+            def Reply( msg )
+                log "Reply with: " + msg.class.name + " To: " + @msg.returnAddress, true
+                @stats.incTotalReply
+                
+                self._SendNeedsWrapping( msg, @msg.returnAddress )
             end
             
-        end
-        
-        #Sends a subscription request across the Bus
-        #
-        # @param [String] eventName event to be subscribes to
-        def Subscribe( eventName )
-            log "Bus.Subscribe: " + eventName, true
             
+            #Send a msg across the bus
+            #msg destination is specified at the infrastructure level
+            #
+            # @param [RServiceBus::Message] msg msg to be sent
+            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
+                    queueName = @config.localQueueName
+                    else
+                    log "No end point mapping found for: " + msgName
+                    log "**** Check environment variable MessageEndpointMappings contains an entry named : " + msgName
+                    raise "No end point mapping found for: " + msgName
+                end
+                
+                
+                self._SendNeedsWrapping( msg, queueName )
+            end
             
-            queueName = @config.messageEndpointMappings[eventName]
-            subscription = Message_Subscription.new( eventName )
+            #Sends an event to all subscribers across the bus
+            #
+            # @param [RServiceBus::Message] msg msg to be sent
+            def Publish( msg )
+                log "Bus.Publish", true
+                @stats.incTotalPublished
+                
+                subscriptions = @subscriptionManager.get(msg.class.name)
+                subscriptions.each do |subscriber|
+                    self._SendNeedsWrapping( msg, subscriber )
+                end
+                
+            end
             
+            #Sends a subscription request across the Bus
+            #
+            # @param [String] eventName event to be subscribes to
+            def Subscribe( eventName )
+                log "Bus.Subscribe: " + eventName, true
+                
+                
+                queueName = @config.messageEndpointMappings[eventName]
+                subscription = Message_Subscription.new( eventName )
+                
+                
+                self._SendNeedsWrapping( subscription, queueName )
+            end
             
-            self._SendNeedsWrapping( subscription, queueName )
         end
         
     end
-    
-end

data/lib/rservicebus/MQ/Beanstalk.rb

@@ -12,7 +12,7 @@ module RServiceBus
         def connect( host, port )
             port ||= 11300
             string = "#{host}:#{port}"
-            
+
             begin
                 @beanstalk = Beanstalk::Pool.new([string])
                 rescue Exception => e
@@ -47,6 +47,11 @@ module RServiceBus
             end
             return @job.body
         end
+
+        def returnToQueue
+            @job.release
+            
+            end
         
         # "Commit" queue
         def ack

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus
 version: !ruby/object:Gem::Version
-  version: 0.0.39
+  version: 0.0.40
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2013-02-26 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby interpretation of NServiceBus
 email: guy@guyirvine.com