rservicebus 0.0.75 → 0.0.76

data/bin/rservicebus-transport

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# The application 'rservicebus-transport' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+require 'rservicebus'
+require 'rservicebus/Transporter'
+
+def run_rservicebus_transport()
+	RServiceBus::Transporter.new().Run()
+end
+
+run_rservicebus_transport
+

data/lib/rservicebus/EndpointMapping.rb

@@ -6,6 +6,14 @@ module RServiceBus
     #	<msg mame 1>:<end point 1>;<msg mame 2>:<end point 2>
     class EndpointMapping
         
+        def getValue( name )
+            return RServiceBus.getValue( name )
+        end
+        
+        def log( string, ver=false )
+            RServiceBus.log( string )
+        end
+
         def configureMapping( mapping )
             match = mapping.match( /(.+):(.+)/ )
             if match.nil? then
@@ -15,23 +23,23 @@ module RServiceBus
                 exit()
             end
             
-            RServiceBus.log( "EndpointMapping.configureMapping: #{match[1]}, #{match[2]}", true )
+            self.log( "EndpointMapping.configureMapping: #{match[1]}, #{match[2]}", true )
             @endpoints[match[1]] = match[2]
-            
+
         end
         
         def Configure
-            RServiceBus.log( "EndpointMapping.Configure" )
-            mappings = RServiceBus.getValue( "MESSAGE_ENDPOINT_MAPPINGS" )
+            self.log( "EndpointMapping.Configure" )
+            mappings = self.getValue( "MESSAGE_ENDPOINT_MAPPINGS" )
             return self if mappings.nil?
-            
+
             mappings.split( ";" ).each do |mapping|
                 self.configureMapping( mapping )
             end
             
             return self
         end
-        
+
         def initialize
             @endpoints=Hash.new
         end

data/lib/rservicebus/Host.rb

@@ -41,7 +41,7 @@ module RServiceBus
                 puts "[#{type}] #{timestamp} :: #{string}"
             end
         end
-        
+
         #Thin veneer for Configuring external resources
         #
         def configureAppResource
@@ -344,6 +344,15 @@ module RServiceBus
             # @param [String] queueName endpoint to which the msg will be sent
             def _SendNeedsWrapping( msg, queueName )
                 log "Bus._SendNeedsWrapping", true
+
+                if queueName.index( "@" ).nil? then
+                    @mq.send( queueName, serialized_object )
+                    else
+                    parts = queueName.split( "@" )
+                    msg.setRemoteQueueName( parts[0] )
+                    msg.setRemoteHostName( parts[1] )
+                    @mq.send( 'transport-out', serialized_object )
+                end
                 
                 rMsg = RServiceBus::Message.new( msg, @config.localQueueName )
                 serialized_object = YAML::dump(rMsg)

data/lib/rservicebus/Message.rb

@@ -3,7 +3,7 @@ module RServiceBus
 #This is the top level message that is passed around the bus
 class Message
 
-	attr_reader :returnAddress, :msgId
+	attr_reader :returnAddress, :msgId, :remoteQueueName, :remoteHostName
 
 # Constructor
 #
@@ -38,6 +38,16 @@ class Message
 		return @errorList.last
 	end
 
+
+    def setRemoteHostName( hostName )
+        @remoteHostName = hostName
+    end
+    
+    def setRemoteQueueName( queueName )
+        @remoteQueueName = queueName
+    end
+
+
 # @return [Object] The msg to be sent
 	def msg
 		return YAML::load( @_msg )

data/lib/rservicebus/Transporter.rb

@@ -0,0 +1,115 @@
+require 'beanstalk-client'
+require 'rservicebus'
+require 'net/ssh/gateway'
+
+module RServiceBus
+
+class CouldNotConnectToDestination<StandardError
+end
+
+
+#ToDo: Poison Message? Can I bury with timeout in beanstalk ?
+#Needs to end up on an error queue, destination queue may be down.
+
+
+class Transporter
+    
+	def log( string, verbose=false )
+        if verbose == false ||
+            ( !ENV["VERBOSE"].nil? && ENV["VERBOSE"].upcase == "TRUE") then
+            puts string
+        end
+	end
+    
+    def getValue( name, default=nil )
+        value = ( ENV[name].nil?  || ENV[name] == ""  ) ? default : ENV[name];
+        log "Env value: #{name}: #{value}"
+        return value
+    end
+    
+	def connectToSourceBeanstalk
+		sourceQueueName = getValue( 'SOURCE_QUEUE_NAME', "transport-out" )
+		sourceUrl = getValue( 'SOURCE_URL', "127.0.0.1:11300" )
+		@source = Beanstalk::Pool.new([sourceUrl])
+        @source.watch sourceQueueName
+        
+		log "Connected to, #{sourceQueueName}@#{sourceUrl}"
+        
+        rescue Exception => e
+        puts "Error connecting to Beanstalk"
+        puts "Host string, #{sourceUrl}"
+        if e.message == "Beanstalk::NotConnected" then
+            puts "***Most likely, beanstalk is not running. Start beanstalk, and try running this again."
+            puts "***If you still get this error, check beanstalk is running at, #{sourceUrl}"
+            else
+            puts e.message
+            puts e.backtrace
+        end
+		abort();
+	end
+    
+    def process
+		#Get the next job from the source queue
+        job = @source.reserve @timeout
+        msg = YAML::load(job.body)
+        
+        log "job: #{job.body}", true
+        
+        
+		#Get destination url from job
+        remote_host = 'mega'
+        remote_user = getValue( "REMOTE_USER_#{remote_host.upcase}", "beanstalk" )
+        gateway = Net::SSH::Gateway.new(remote_host, remote_user)
+        
+        # Open port 27018 to forward to 127.0.0.11300 on the remote host
+        gateway.open('127.0.0.1', 11300, 27018)
+        
+		log "Connect to destination beanstalk"
+        begin
+            destincationUrl = '127.0.0.1:27018'
+            destination = Beanstalk::Pool.new([destincationUrl])
+            rescue Exception => e
+            if e.message == "Beanstalk::NotConnected" then
+                puts "***Could not connect to destination, check beanstalk is running at, #{destincationUrl}"
+                raise CouldNotConnectToDestination.new
+            end
+            raise
+        end
+        
+        
+		#getDestinationQueueName
+		destinationQueueName = "transportIn"
+        queueName = msg.destinationQueueName
+        
+		#putMsg
+        log "Put msg, #{job.body}", true
+        destination.use( destinationQueueName )
+        destination.put( job.body )
+        
+        
+		#removeJob
+		job.delete
+        
+        
+        gateway.shutdown!
+        
+        rescue Exception => e
+        if e.message == "TIMED_OUT" then
+            log "No Msg", true
+            return
+        end
+        raise e
+    end
+    
+	def Run
+		@timeout = getValue( 'TIMEOUT', 5 )
+		connectToSourceBeanstalk
+		while true
+			process
+		end
+	end
+end
+
+
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus
 version: !ruby/object:Gem::Version
-  version: 0.0.75
+  version: 0.0.76
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-21 00:00:00.000000000 Z
+date: 2013-08-10 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby interpretation of NServiceBus
 email: guy@guyirvine.com
@@ -20,6 +20,7 @@ executables:
 - ReturnErroredMessagesToSourceQueueBeanstalk
 - ReturnErroredMessagesToSourceQueueBunny
 - SendEmptyMessage
+- rservicebus-transport
 extensions: []
 extra_rdoc_files: []
 files:
@@ -68,12 +69,14 @@ files:
 - lib/rservicebus/Test/Bus.rb
 - lib/rservicebus/Test/Redis.rb
 - lib/rservicebus/Test.rb
+- lib/rservicebus/Transporter.rb
 - lib/rservicebus.rb
 - bin/ReturnErroredMessagesToSourceQueue
 - bin/ReturnErroredMessagesToSourceQueueBeanstalk
 - bin/ReturnErroredMessagesToSourceQueueBunny
 - bin/rservicebus
 - bin/rservicebus-init
+- bin/rservicebus-transport
 - bin/SendEmptyMessage
 - LICENSE
 - README.md