rservicebus 0.1.9 → 0.1.10

data/lib/rservicebus/AppResource/State.rb

@@ -0,0 +1,68 @@
+module RServiceBus
+    
+    class State
+        
+        def initialize( path )
+            @path = path
+        end
+        
+        def get( name )
+            return -1 unless @state.has_key?("name")
+            
+            return @state["name"]
+        end
+        
+        def set( name, id )
+            @state["name"] = id
+        end
+        
+        def load
+            if !File.exists?( @path ) then
+                @state = Hash.new if !File.exists?( @path )
+                return
+            end
+            
+            content = IO.read( @path )
+            if content == "" then
+                @state = Hash.new
+            end
+            
+            
+            @state = YAML::load( content )
+        end
+        
+        def save
+            content = YAML::dump( @state )
+            IO.write( @path, content )
+        end
+        
+        def close
+            
+        end
+        
+    end
+    
+    
+    class AppResource_State<AppResource
+        
+        def connect(uri)
+            return State.new( uri.path )
+        end
+
+        # Transaction Semantics
+        def Begin
+            @connection.load
+        end
+
+        # Transaction Semantics
+        def Commit
+            @connection.save
+        end
+        
+        # Transaction Semantics
+        def Rollback
+            @connection.load
+        end
+    end
+    
+end

data/lib/rservicebus/Transporter.rb

@@ -48,26 +48,44 @@ class Transporter
 		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
-        
+    def connectToRemoteSSH( remoteHostName )
+        return if @remoteHostName == remoteHostName
         
+        self.disconnectFromRemoteSSH
+
 		#Get destination url from job
-        remote_host = msg.remoteHostName
-        remote_user = getValue( "REMOTE_USER_#{remote_host.upcase}", "beanstalk" )
-        gateway = Net::SSH::Gateway.new(remote_host, remote_user)
+        @remoteHostName = remoteHostName
+        @remoteUserName = getValue( "REMOTE_USER_#{remoteHostName.upcase}", "beanstalk" )
+        @gateway = Net::SSH::Gateway.new(remoteHostName, @remoteUserName)
         
         # Open port 27018 to forward to 127.0.0.11300 on the remote host
-        gateway.open('127.0.0.1', 11300, 27018)
+        @gateway.open('127.0.0.1', 11300, 27018)
+        log "Connect to Remote SSH, #{@remoteHostName}"
+        
+        return @gateway
+    end
 
-		log "Connect to destination beanstalk"
+    def disconnectFromRemoteSSH
+        return if @gateway.nil?
+        
+        log "Disconnect from Remote SSH, #{@remoteHostName}"
+        @gateway.shutdown!
+        @remoteHostName = nil
+        @gateway = nil
+    end
+
+    
+    def connectToRemoteBeanstalk( remoteHostName, remoteQueueName )
+        self.connectToRemoteSSH( remoteHostName )
+        
+        #Test connection
+        return if @remoteQueueName == remoteQueueName
+        
+
+        log "Connect to Remote Beanstalk, #{remoteQueueName}"
         begin
             destinationUrl = '127.0.0.1:27018'
-            destination = Beanstalk::Pool.new([destinationUrl])
+            @destination = Beanstalk::Pool.new([destinationUrl])
             rescue Exception => e
             if e.message == "Beanstalk::NotConnected" then
                 puts "***Could not connect to destination, check beanstalk is running at, #{destinationUrl}"
@@ -75,10 +93,33 @@ class Transporter
             end
             raise
         end
+        
+        log "Use queue, #{remoteQueueName}", true
+        @destination.use( remoteQueueName )
+        @remoteQueueName = remoteQueueName
+    end
+    
+    def disconnectFromRemoteBeanstalk
+        self.disconnectFromRemoteSSH
+        return if @destination.nil?
+
+        log "Disconnect from Remote Beanstalk, #{@remoteQueueName}"
+        @destination.close
+        @remoteQueueName = nil
+    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
+
+        self.connectToRemoteBeanstalk( msg.remoteHostName, msg.remoteQueueName )
 
-        log "Put msg, #{job.body}", true
-        destination.use( msg.remoteQueueName )
-        destination.put( job.body )
+        log "Put msg", true
+        @destination.put( job.body )
  
         if !ENV['AUDIT_QUEUE_NAME'].nil? then
             @source.use ENV['AUDIT_QUEUE_NAME']
@@ -87,11 +128,11 @@ class Transporter
 		#removeJob
 		job.delete
         
-        
-        gateway.shutdown!
-		log "Job sent to, #{remote_user}@#{remote_host}/#{msg.remoteQueueName}"
-        
+		log "Job sent to, #{@remoteUserName}@#{@remoteHostName}/#{@remoteQueueName}"
+
+
         rescue Exception => e
+        self.disconnectFromRemoteSSH
         if e.message == "TIMED_OUT" then
             log "No Msg", true
             return
@@ -105,6 +146,7 @@ class Transporter
 		while true
 			process
 		end
+        self.disconnectFromRemoteSSH
 	end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-26 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby interpretation of NServiceBus
 email: guy@guyirvine.com
@@ -35,6 +35,7 @@ files:
 - lib/rservicebus/AppResource/Redis.rb
 - lib/rservicebus/AppResource/ScpUpload.rb
 - lib/rservicebus/AppResource/Smb.rb
+- lib/rservicebus/AppResource/State.rb
 - lib/rservicebus/AppResource.rb
 - lib/rservicebus/Config.rb
 - lib/rservicebus/ConfigureAppResource.rb