rservicebus 0.1.48 → 0.1.49

data/lib/rservicebus.rb

@@ -15,7 +15,7 @@ require "rservicebus/ErrorMessage"
 require "rservicebus/HandlerLoader"
 require "rservicebus/HandlerManager"
 require "rservicebus/ConfigureAppResource"
-require "rservicebus/ConfigureMQ"
+require "rservicebus/MQ"
 require "rservicebus/Host"
 require "rservicebus/Config"
 require "rservicebus/EndpointMapping"

data/lib/rservicebus/Agent.rb

@@ -1,17 +1,53 @@
 module RServiceBus
-    
+
+class QueueNotFoundForMsg<StandardError
+end
+
     #A means for a stand-alone process to interact with the bus, without being a full
     #rservicebus application
     class Agent
         
-        def getAgent( uri )
-            if uri.scheme == "beanstalk" then
-                require "rservicebus/Agent/Beanstalk"
-                return Agent_Beanstalk.new()
+        @mq
+        
+        def initialize
+            @mq = MQ.get
+        end
+        
+        # Put a msg on the bus
+        #
+        # @param [Object] messageObj The msg to be sent
+        # @param [String] queueName the name of the queue to be send the msg to
+        # @param [String] returnAddress the name of a queue to send replies to
+        def sendMsg(messageObj, queueName, returnAddress=nil)
+            raise QueueNotFoundForMsg.new( messageObj.class.name ) if queueName.nil?
+
+            msg = RServiceBus::Message.new( messageObj, returnAddress )
+
+            
+            if queueName.index( "@" ).nil? then
+                q = queueName
                 else
-                raise StandardError.new( "Scheme not recognised" )
-                
+                parts = queueName.split( "@" )
+                msg.setRemoteQueueName( parts[0] )
+                msg.setRemoteHostName( parts[1] )
+                q = 'transport-out'
             end
+            
+            serialized_object = YAML::dump(msg)
+            
+            @mq.send( q, serialized_object )
+        end
+        
+        # Gives an agent the means to receive a reply
+        #
+        # @param [String] queueName the name of the queue to monitor for messages
+        def checkForReply( queueName )
+            @mq.subscribe( queueName )
+            body = @mq.pop
+            @msg = YAML::load(body)
+            @mq.ack
+            return @msg.msg
         end
+
     end
 end

data/lib/rservicebus/Config.rb

@@ -2,14 +2,13 @@ module RServiceBus
     
     #Marshals configuration information for an rservicebus host
     class Config
-        attr_reader :appName, :messageEndpointMappings, :handlerPathList, :localQueueName, :errorQueueName, :maxRetries, :forwardReceivedMessagesTo, :subscriptionUri, :queueTimeout, :statOutputCountdown, :contractList, :libList, :forwardSentMessagesTo, :mqHost
+        attr_reader :appName, :messageEndpointMappings, :handlerPathList, :errorQueueName, :maxRetries, :forwardReceivedMessagesTo, :subscriptionUri, :statOutputCountdown, :contractList, :libList, :forwardSentMessagesTo, :mqHost
         
         @appName
         @messageEndpointMappings
         @handlerPathList
         @contractList
         
-        @localQueueName
         @errorQueueName
         @forwardSentMessagesTo
         @maxRetries
@@ -18,8 +17,6 @@ module RServiceBus
         
         @mq
         
-        @queueTimeout
-        
         def initialize()
             puts "Cannot instantiate config directly."
             puts "For production, use ConfigFromEnv."
@@ -56,10 +53,8 @@ module RServiceBus
         
         def loadHostSection()
             @appName = self.getValue( "APPNAME", "RServiceBus" )
-            @localQueueName = self.getValue( "LOCAL_QUEUE_NAME", @appName )
             @errorQueueName = self.getValue( "ERROR_QUEUE_NAME", "error" )
             @maxRetries = self.getValue( "MAX_RETRIES", "5" ).to_i
-            @queueTimeout = self.getValue( "QUEUE_TIMEOUT", "5" ).to_i
             @statOutputCountdown = self.getValue( "STAT_OUTPUT_COUNTDOWN", "100" ).to_i
             @subscriptionUri = self.getValue( "SUBSCRIPTION_URI", "file:///tmp/#{appName}_subscriptions.yaml" )
 
@@ -192,7 +187,7 @@ module RServiceBus
     end
     
     class ConfigFromSetter<Config
-        attr_writer :appName, :messageEndpointMappings, :handlerPathList, :localQueueName, :errorQueueName, :maxRetries, :forwardReceivedMessagesTo, :beanstalkHost
+        attr_writer :appName, :messageEndpointMappings, :handlerPathList, :errorQueueName, :maxRetries, :forwardReceivedMessagesTo, :beanstalkHost
         
         def initialize()
         end

data/lib/rservicebus/Host.rb

@@ -72,7 +72,7 @@ module RServiceBus
         #Thin veneer for Configuring the Message Queue
         #
         def connectToMq
-            @mq = ConfigureMQ.new.get( @config.mqHost + "/" + @config.localQueueName, @config.queueTimeout )
+            @mq = MQ.get
             
             return self
         end
@@ -153,13 +153,14 @@ module RServiceBus
         def initialize()
             @config = ConfigFromEnv.new
 			.loadHostSection()
-			.configureMq()
 			.loadContracts()
 			.loadHandlerPathList()
             .loadLibs()
             .loadWorkingDirList();
-            
-            @endpointMapping = EndpointMapping.new.Configure( @config.localQueueName )
+
+            self.connectToMq()
+
+            @endpointMapping = EndpointMapping.new.Configure( @mq.localQueueName )
             
             self.configureStatistics()
             .loadContracts()
@@ -170,7 +171,6 @@ module RServiceBus
 			.configureMonitors()
 			.loadHandlers()
             .configureCronManager()
-			.connectToMq()
 			.configureSubscriptions()
 			.sendSubscriptions()
 
@@ -183,8 +183,8 @@ module RServiceBus
         def run
             log "Starting the Host"
             
-            log "Watching, #{@config.localQueueName}"
-            $0 = "rservicebus - #{@config.localQueueName}"
+            log "Watching, #{@mq.localQueueName}"
+            $0 = "rservicebus - #{@mq.localQueueName}"
             if !@config.forwardReceivedMessagesTo.nil? then
                 log "Forwarding all received messages to: " + @config.forwardReceivedMessagesTo.to_s
             end
@@ -242,7 +242,7 @@ module RServiceBus
                         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 )
+                        @msg.addErrorMsg( @mq.localQueueName, e.message )
                         serialized_object = YAML::dump(@msg)
                         self._SendAlreadyWrappedAndSerialised(serialized_object, @config.errorQueueName)
                         @mq.ack
@@ -251,7 +251,7 @@ module RServiceBus
                         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 )
+                        @msg.addErrorMsg( @mq.localQueueName, e.message )
                         serialized_object = YAML::dump(@msg)
                         self._SendAlreadyWrappedAndSerialised(serialized_object, @config.errorQueueName)
                         @mq.ack
@@ -294,7 +294,7 @@ module RServiceBus
                             errorString = e.message + ". " + e.backtrace.join( ". " )
                             #                            log errorString
                             
-                            @msg.addErrorMsg( @config.localQueueName, errorString )
+                            @msg.addErrorMsg( @mq.localQueueName, errorString )
                             serialized_object = YAML::dump(@msg)
                             self._SendAlreadyWrappedAndSerialised(serialized_object, @config.errorQueueName)
                             @mq.ack
@@ -397,7 +397,7 @@ module RServiceBus
             def _SendNeedsWrapping( msg, queueName )
                 log "Bus._SendNeedsWrapping", true
 
-                rMsg = RServiceBus::Message.new( msg, @config.localQueueName )
+                rMsg = RServiceBus::Message.new( msg, @mq.localQueueName )
                 if queueName.index( "@" ).nil? then
                     q = queueName
                     log "Sending, #{msg.class.name} to, queueName", true
@@ -439,7 +439,7 @@ module RServiceBus
                 queueName = @endpointMapping.get( msgName )
                 return queueName unless queueName.nil?
                 
-                return @config.localQueueName if @handlerManager.canMsgBeHandledLocally(msgName)
+                return @mq.localQueueName if @handlerManager.canMsgBeHandledLocally(msgName)
                 
                 log "No end point mapping found for: " + msgName
                 log "**** Check environment variable MessageEndpointMappings contains an entry named : " + msgName

data/lib/rservicebus/MQ.rb

@@ -10,34 +10,63 @@ module RServiceBus
     # - dependency injection.
     #
     class MQ
+        
+        attr_reader :localQueueName
+        
         @uri
         
+        
+        def MQ.get
+            mqString = RServiceBus.getValue( "RSBMQ", "beanstalk://localhost" );
+            uri = URI.parse( mqString )
+            
+            case uri.scheme
+                when "beanstalk"
+                require "rservicebus/MQ/Beanstalk"
+                mq = MQ_Beanstalk.new( uri )
+                
+                when "redis"
+                require "rservicebus/MQ/Redis"
+                mq = MQ_Redis.new( uri )
+                
+                else
+                abort("Scheme, #{uri.scheme}, not recognised when configuring mq, #{string}");
+            end
+            
+            return mq
+        end
+        
         # Resources are attached resources, and can be specified using the URI syntax.
         #
         # @param [URI] uri the type and location of queue, eg beanstalk://127.0.0.1/foo
         # @param [Integer] timeout the amount of time to wait for a msg to arrive
-        def initialize( uri, timeout )
-            @timeout = timeout
+        def initialize( uri )
+            
             if uri.is_a? URI then
                 @uri = uri
                 else
                 puts "uri must be a valid URI"
                 abort()
             end
-            
-            host = uri.host
-            port = uri.port
-            queue = uri.path.sub( "/", "" )
-            
-            if ( queue == "" )
+
+            if uri.path == "" || uri.path == "/" then
+                @localQueueName = RServiceBus.getValue( "APPNAME", "RServiceBus" )
+                else
+                @localQueueName = uri.path
+                @localQueueName[0] = ""
+            end
+
+            if @localQueueName == "" then
+                puts "@localQueueName: #{@localQueueName}"
                 puts "Queue name must be supplied "
                 puts "*** uri, #{uri}, needs to contain a queue name"
                 puts "*** the structure is scheme://host[:port]/queuename"
                 abort()
             end
-
+            
+            @timeout = RServiceBus.getValue( "QUEUE_TIMEOUT", "5" ).to_i
             self.connect(uri.host, uri.port)
-            self.subscribe( queue )
+            self.subscribe( @localQueueName )
         end
         
         # Connect to the broker

data/lib/rservicebus/MQ/Redis.rb

@@ -0,0 +1,57 @@
+module RServiceBus
+    
+    require "rservicebus/MQ"
+    require "redis"
+    
+    # Beanstalk client implementation.
+    #
+    class MQ_Redis<MQ
+        
+        # Connect to the broker
+        #
+        def connect( host, port )
+            port ||= 6379
+            string = "#{host}:#{port}"
+
+            begin
+                @redis = Redis.new(:host => host, :port => port)
+
+                rescue Exception => e
+                puts e.message
+                puts "Error connecting to Redis for mq"
+                puts "Host string, #{string}"
+                abort()
+            end
+        end
+        
+        # Connect to the queue
+        #
+        def subscribe( queuename )
+            @queuename = queuename
+        end
+        
+        # Get next msg from queue
+        def pop
+                if @redis.llen( @queuename ) == 0 then
+                    sleep @timeout
+                    raise NoMsgToProcess.new
+                end
+                
+                return @redis.lindex @queuename, 0
+        end
+
+        def returnToQueue
+        end
+        
+        # "Commit" queue
+        def ack
+            @redis.lpop @queuename
+        end
+
+        # At least called in the Host rescue block, to ensure all network links are healthy
+        def send( queueName, msg )
+            @redis.rpush queueName, msg
+        end
+
+    end
+end

data/lib/rservicebus/helper_functions.rb

@@ -42,7 +42,8 @@ module RServiceBus
 	endpointMapping.Configure
 	queueName = endpointMapping.get( msg.class.name )
 
-	agent = RServiceBus::Agent.new.getAgent( URI.parse( "beanstalk://127.0.0.1:11300" ) )
+    ENV["RSBMQ"] = "beanstalk://localhost" if ENV["RSBMQ"].nil?
+    agent = RServiceBus::Agent.new
     Audit.new( agent ).audit( msg )
 	agent.sendMsg(msg, queueName, responseQueue)
 
@@ -60,7 +61,8 @@ module RServiceBus
         endpointMapping.Configure
         queueName = endpointMapping.get( msg.class.name )
         
-        agent = RServiceBus::Agent.new.getAgent( URI.parse( "beanstalk://127.0.0.1:11300" ) )
+        ENV["RSBMQ"] = "beanstalk://localhost" if ENV["RSBMQ"].nil?
+        agent = RServiceBus::Agent.new
         Audit.new( agent ).auditOutgoing( msg )
         agent.sendMsg(msg, queueName, responseQueue)
         
@@ -73,7 +75,8 @@ module RServiceBus
     end
     
     def RServiceBus.checkForReply( queueName )
-        agent = RServiceBus::Agent.new.getAgent( URI.parse( "beanstalk://127.0.0.1:11300" ) )
+        ENV["RSBMQ"] = "beanstalk://localhost" if ENV["RSBMQ"].nil?
+        agent = RServiceBus::Agent.new
         msg = agent.checkForReply( queueName )
         Audit.new( agent ).auditIncoming( msg )
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus
 version: !ruby/object:Gem::Version
-  version: 0.1.48
+  version: 0.1.49
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &70114846310520 !ruby/object:Gem::Requirement
+  requirement: &70296757940520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70114846310520
+  version_requirements: *70296757940520
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70114846309440 !ruby/object:Gem::Requirement
+  requirement: &70296757940060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70114846309440
+  version_requirements: *70296757940060
 - !ruby/object:Gem::Dependency
   name: beanstalk-client
-  requirement: &70114846308800 !ruby/object:Gem::Requirement
+  requirement: &70296757939360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70114846308800
+  version_requirements: *70296757939360
 - !ruby/object:Gem::Dependency
   name: fluiddb
-  requirement: &70114846308260 !ruby/object:Gem::Requirement
+  requirement: &70296757938880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70114846308260
+  version_requirements: *70296757938880
 - !ruby/object:Gem::Dependency
   name: parse-cron
-  requirement: &70114846307660 !ruby/object:Gem::Requirement
+  requirement: &70296757928940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70114846307660
+  version_requirements: *70296757928940
 description: A Ruby interpretation of NServiceBus
 email: guy@guyirvine.com
 executables:
@@ -77,7 +77,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/rservicebus/Agent/Beanstalk.rb
 - lib/rservicebus/Agent.rb
 - lib/rservicebus/AppResource/Dir.rb
 - lib/rservicebus/AppResource/File.rb
@@ -99,7 +98,6 @@ files:
 - lib/rservicebus/Config.rb
 - lib/rservicebus/ConfigureAppResource.rb
 - lib/rservicebus/ConfigureMonitor.rb
-- lib/rservicebus/ConfigureMQ.rb
 - lib/rservicebus/ConfigureSubscriptionStorage.rb
 - lib/rservicebus/CronManager.rb
 - lib/rservicebus/EndpointMapping.rb
@@ -120,6 +118,7 @@ files:
 - lib/rservicebus/Monitor/XmlDir.rb
 - lib/rservicebus/Monitor.rb
 - lib/rservicebus/MQ/Beanstalk.rb
+- lib/rservicebus/MQ/Redis.rb
 - lib/rservicebus/MQ.rb
 - lib/rservicebus/Saga.rb
 - lib/rservicebus/StateManager.rb

data/lib/rservicebus/Agent/Beanstalk.rb

@@ -1,57 +0,0 @@
-module RServiceBus
-require 'beanstalk-client'
-
-class QueueNotFoundForMsg<StandardError
-end
-
-
-#A means for a stand-alone process to interact with the bus, without being a full
-#rservicebus application
-class Agent_Beanstalk
-	@beanstalk
-	
-	def initialize(url=['localhost:11300'])
-		@beanstalk = Beanstalk::Pool.new(url)
-	end
-
-# Put a msg on the bus
-#
-# @param [Object] messageObj The msg to be sent
-# @param [String] queueName the name of the queue to be send the msg to
-# @param [String] returnAddress the name of a queue to send replies to
-	def sendMsg(messageObj, queueName, returnAddress=nil)
-		raise QueueNotFoundForMsg.new( messageObj.class.name ) if queueName.nil?
-
-		msg = RServiceBus::Message.new( messageObj, returnAddress )
-
-
-        if queueName.index( "@" ).nil? then
-            q = queueName
-            else
-            parts = queueName.split( "@" )
-            msg.setRemoteQueueName( parts[0] )
-            msg.setRemoteHostName( parts[1] )
-            q = 'transport-out'
-        end
-
-        serialized_object = YAML::dump(msg)
-
-		@beanstalk.use( q )
-		@beanstalk.put( serialized_object )
-	end
-
-# Gives an agent the means to receive a reply
-#
-# @param [String] queueName the name of the queue to monitor for messages
-	def checkForReply( queueName )
-		@beanstalk.watch queueName
-		job = @beanstalk.reserve
-		body = job.body
-		job.delete
-
-		@msg = YAML::load(body)
-		return @msg.msg
-	end
-end
-
-end

data/lib/rservicebus/ConfigureMQ.rb

@@ -1,25 +0,0 @@
-module RServiceBus
-    
-    require "uri"
-    
-    #Configure AppResources for an rservicebus host
-    class ConfigureMQ
-        
-        def get( string, timeout )
-
-            uri = URI.parse( string )
-            case uri.scheme
-                when "beanstalk"
-                require "rservicebus/MQ/Beanstalk"
-                mq = MQ_Beanstalk.new( uri, timeout )
-
-                else
-                abort("Scheme, #{uri.scheme}, not recognised when configuring mq, #{string}");
-            end
-            
-            return mq
-        end
-        
-    end
-    
-end