rservicebus 0.0.41 → 0.0.42

data/lib/rservicebus.rb

@@ -6,6 +6,7 @@ require "yaml"
 require "uuidtools"
 require "redis"
 require "json"
+require "uri"
 
 require "rservicebus/helper_functions"
 require "rservicebus/ErrorMessage"
@@ -26,6 +27,8 @@ require "rservicebus/SubscriptionManager"
 require "rservicebus/SubscriptionStorage"
 require "rservicebus/ConfigureSubscriptionStorage"
 
+require "rservicebus/ConfigureMonitor"
+
 require 'rservicebus/Agent'
 
 

data/lib/rservicebus/Config.rb

@@ -118,13 +118,15 @@ class Config
 #Expected format;
 #	/one/two/Contracts
 	def loadContracts()
-		if self.getValue( "CONTRACTS", "./Contract" ).nil? then
+        @contractList = Array.new
+
+        #This is a guard clause in case no Contracts have been specified
+        #If any guard clauses have been specified, then execution should drop to the second block
+        if self.getValue( "CONTRACTS" ).nil? then
 			return self
 		end
-        @contractList = Array.new
 
 		self.getValue( "CONTRACTS", "./Contract" ).split( ";" ).each do |path|
-			log "Loading contracts from, #{path}"
 			self.ensureContractFileExists( path )
 			@contractList << path
 		end

data/lib/rservicebus/ConfigureAppResource.rb

@@ -7,7 +7,7 @@ module RServiceBus
 
         def getResources( env )
             resources = Hash.new
-            
+
             env.each do |k,v|
                 if v.is_a?(String) and
 					k.start_with?( "RSB_" ) then

data/lib/rservicebus/ConfigureMonitor.rb

@@ -0,0 +1,82 @@
+module RServiceBus
+
+    require 'rservicebus/Monitor'
+    require 'rservicebus/Monitor/Message'
+
+    #Configure AppResources for an rservicebus host
+    class ConfigureMonitor
+        
+        @resourceList
+
+        # Constructor
+        #
+        # @param [RServiceBus::Host] host instance
+        # @param [Hash] appResources As hash[k,v] where k is the name of a resource, and v is the resource
+        def initialize( host, appResources )
+            @host = host
+            @appResources = appResources
+            
+            @handlerList = Hash.new
+            @resourceList = Hash.new
+        end
+
+        # 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( monitor )
+            @host.log "Checking app resources for: #{monitor.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|
+                if monitor.class.method_defined?( k ) then
+                    monitor.instance_variable_set( "@#{k}", v.getResource() )
+                    @resourceList[monitor.class.name] = Array.new if @resourceList[monitor.class.name].nil?
+                    @resourceList[monitor.class.name] << v
+                    @host.log "App resource attribute, #{k}, set for: " + monitor.class.name
+                end
+            end
+            
+            return self
+        end
+
+
+        def getMonitors( env )
+            monitors = Array.new
+
+            env.each do |k,v|
+                if v.is_a?(String) and
+					k.start_with?( "RSBOB_" ) then
+                    uri = URI.parse( v )
+                    name = k.sub( "RSBOB_", "" )
+                    monitor = nil?
+                    case uri.scheme
+                        when "csvdir"
+                        require "rservicebus/Monitor/CsvDir"
+						monitor = Monitor_CsvDir.new( @host, name, uri )
+
+                        when "xmldir"
+                        require "rservicebus/Monitor/XmlDir"
+						monitor = Monitor_XmlDir.new( @host, name, uri )
+                        
+                        when "dir"
+                        require "rservicebus/Monitor/Dir"
+						monitor = Monitor_Dir.new( @host, name, uri )
+                        
+                        when "csvperlinedir"
+                        require "rservicebus/Monitor/CsvPerLine"
+						monitor = Monitor_CsvPerLineDir.new( @host, name, uri )
+                        else
+						abort("Scheme, #{uri.scheme}, not recognised when configuring Monitor, #{k}=#{v}");
+                    end
+                    self.setAppResources( monitor )
+                    monitors << monitor
+                end
+                
+            end
+            
+            return monitors
+        end
+        
+    end
+    
+end

data/lib/rservicebus/HandlerLoader.rb

@@ -22,6 +22,8 @@ class HandlerLoader
 
 	@handlerList
     @resourceList
+    
+    @listOfLoadedPaths
 
 # Constructor
 #
@@ -33,6 +35,8 @@ class HandlerLoader
 		
 		@handlerList = Hash.new
         @resourceList = Hash.new
+        
+        @listOfLoadedPaths = Hash.new
 	end
 
 # Cleans the given path to ensure it can be used for as a parameter for the require statement.
@@ -110,7 +114,12 @@ class HandlerLoader
 # @param [String] filePath
 # @param [String] handlerName
 # @returns [RServiceBus::Handler] handler
-	def loadAndConfigureHandler(filePath, handlerName)
+	def loadAndConfigureHandler(msgName, filePath, handlerName)
+        if @listOfLoadedPaths.has_key?( filePath ) then
+            @host.log "Not reloading, #{filePath}"
+            return
+        end
+
 		begin
 			@host.log "filePath: " + filePath, true
 			@host.log "handlerName: " + handlerName, true
@@ -120,7 +129,10 @@ class HandlerLoader
 			self.setAppResources( handler )
 			@host.log "Loaded Handler: " + handlerName
 
-			return handler
+            @handlerList[msgName] = Array.new unless @handlerList.has_key?( msgName )
+            @handlerList[msgName] << handler;
+            
+            @listOfLoadedPaths[filePath] = 1
 		rescue Exception => e
 			puts "Exception loading handler from file: " + filePath
 			puts e.message
@@ -155,12 +167,7 @@ class HandlerLoader
 					fileName = File.basename( filePath ).sub( ".rb", "" )
 					handlerName = "MessageHandler_#{msgName}_#{fileName}"
 
-					handler = self.loadAndConfigureHandler( filePath, handlerName )
-					if !@handlerList.has_key?( msgName ) then
-						@handlerList[msgName] = Array.new
-					end
-
-					@handlerList[msgName] << handler;
+					self.loadAndConfigureHandler( msgName, filePath, handlerName )
 				end
 			end
 		end
@@ -194,13 +201,7 @@ class HandlerLoader
 					self.loadHandlersFromSecondLevelPath( msgName, filePath )
 				else
 					handlerName = "MessageHandler_#{msgName}"
-					handler = self.loadAndConfigureHandler( filePath, handlerName )
-
-					if !@handlerList.has_key?( msgName ) then
-						@handlerList[msgName] = Array.new
-					end
-
-					@handlerList[msgName] << handler;
+					self.loadAndConfigureHandler( msgName, filePath, handlerName )
 				end
 			end
 		end

data/lib/rservicebus/Host.rb

@@ -33,14 +33,21 @@ module RServiceBus
                 puts "[#{type}] #{timestamp} :: #{string}"
             end
         end
-        
+
         #Thin veneer for Configuring external resources
         #
         def configureAppResource
             @appResources = ConfigureAppResource.new.getResources( ENV )
             return self;
         end
-        
+
+        #Thin veneer for Configuring external resources
+        #
+        def configureMonitors
+            @monitors = ConfigureMonitor.new( self, @appResources ).getMonitors( ENV )
+            return self;
+        end
+
         #Thin veneer for Configuring the Message Queue
         #
         def connectToMq
@@ -48,7 +55,7 @@ module RServiceBus
             
             return self
         end
-        
+
         #Subscriptions are specified by adding events to the
         #msg endpoint mapping
         def sendSubscriptions
@@ -70,11 +77,11 @@ module RServiceBus
         def loadHandlers()
             log "Load Message Handlers"
             @handlerLoader = HandlerLoader.new( self, @appResources )
-            
+
             @config.handlerPathList.each do |path|
                 @handlerLoader.loadHandlersFromPath(path)
             end
-            
+
             @handlerList = @handlerLoader.handlerList
             @resourceByHandlerNameList = @handlerLoader.resourceList
             
@@ -85,9 +92,10 @@ module RServiceBus
         #
         def loadContracts()
             log "Load Contracts"
-            
+
             @config.contractList.each do |path|
                 require path
+                log "Loaded Contract: #{path}", true
             end
             
             return self
@@ -129,7 +137,6 @@ module RServiceBus
         end
         
         def initialize()
-            
             @config = ConfigFromEnv.new
 			.configureLogging()
 			.loadHostSection()
@@ -141,11 +148,12 @@ module RServiceBus
             .loadWorkingDirList();
             
             self.configureStatistics()
-			.configureAppResource()
-			.connectToMq()
-			.loadHandlers()
             .loadContracts()
             .loadLibs()
+			.configureAppResource()
+			.configureMonitors()
+			.loadHandlers()
+			.connectToMq()
 			.configureSubscriptions()
 			.sendSubscriptions()
             
@@ -212,7 +220,7 @@ module RServiceBus
                         end
                         tempResourceList.each {|k,resource| resource.reconnect }
                         tempHandlerList.each {|k,handler| @handlerLoader.setAppResources( handler ) }
- 
+                        
                         if retries > 0 then
                             retries = retries - 1
                             @mq.returnToQueue
@@ -248,6 +256,12 @@ module RServiceBus
                     rescue NoMsgToProcess => e
                     #This exception is just saying there are no messages to process
                     statOutputCountdown = 0
+                    
+                    @monitors.each do |o|
+                        o.Look
+                    end
+                    
+                    
                     rescue Exception => e
                     if e.message == "SIGTERM" then
                         puts "Exiting on request ..."
@@ -273,7 +287,7 @@ module RServiceBus
                     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|
@@ -287,7 +301,7 @@ module RServiceBus
                     end
                 end
             end
-
+            
             #Sends a msg across the bus
             #
             # @param [String] serialized_object serialized RServiceBus::Message

data/lib/rservicebus/Monitor.rb

@@ -0,0 +1,64 @@
+class Monitor
+
+    attr_accessor :Bus
+
+    @Bus
+    @uri
+    @connection
+    @MsgType
+    
+    # The method which actually connects to the resource.
+    #
+    def connect(uri)
+        raise "Method, connect, needs to be implemented for resource"
+    end
+    
+    # The method which actually connects to the resource.
+    #
+    def Look
+        raise "Method, Look, needs to be implemented for the Monitor"
+    end
+
+    def _connect
+        @connection = self.connect(@uri)
+        @Bus.log "#{self.class.name}. Connected to, #{@uri.to_s}" unless !ENV["QUIET"].nil?
+    end
+
+    # Resources are attached resources, and can be specified using the URI syntax.
+    #
+    # @param [String] uri a location for the resource to which we will attach, eg redis://127.0.0.1/foo
+    def initialize( bus, name, uri )
+        @Bus = bus
+        #        @MsgType = Object.const_get( name )
+        newAnonymousClass = Class.new(Monitor_Message)
+        Object.const_set( name, newAnonymousClass )
+        @MsgType = Object.const_get( name )
+        
+
+        @uri = uri
+        self._connect
+    end
+    
+    # A notification that allows cleanup
+    def finished
+    end
+    
+    # At least called in the Host rescue block, to ensure all network links are healthy
+    def reconnect
+        begin
+            self.finished
+            rescue Exception => e
+            puts "** Monitor. An error was raised while closing connection to, " + @uri.to_s
+            puts "Message: " + e.message
+            puts e.backtrace
+        end
+        
+        self._connect
+    end
+    
+    def send( payload )
+        msg = @MsgType.new( payload )
+
+        @Bus.Send( msg )
+    end
+end

data/lib/rservicebus/Monitor/CsvDir.rb

@@ -0,0 +1,11 @@
+require 'rservicebus/Monitor/Dir'
+require 'csv'
+
+class Monitor_CsvDir<Monitor_Dir
+    
+
+    def ProcessPath( path )
+        return CSV.read( path )
+    end
+
+end

data/lib/rservicebus/Monitor/CsvPerLine.rb

@@ -0,0 +1,13 @@
+require 'rservicebus/Monitor/Dir'
+require 'csv'
+
+class Monitor_CsvPerLineDir<Monitor_Dir
+    
+
+    def ProcessFile( file )
+        CSV.read( file ).each do |csvline|
+            self.send( csvline )
+        end
+    end
+
+end

data/lib/rservicebus/Monitor/Dir.rb

@@ -0,0 +1,31 @@
+
+class Monitor_Dir<Monitor
+    
+    @Path
+
+    def connect(uri)
+        #Pass the path through the Dir object to check syntax on startup
+        inputDir = Dir.new( uri.path )
+        @Path = inputDir.path
+    end
+
+    def ProcessPath( path )
+        return IO.read( path )
+    end
+
+    def ProcessFile( file )
+        payload = self.ProcessPath( file )
+        
+        self.send( payload )
+    end
+    
+    def Look
+        Dir.glob( "#{@Path}/*" ).each do |file|
+            self.ProcessFile( file )
+
+            File.unlink( file )
+        end
+        
+    end
+
+end

data/lib/rservicebus/Monitor/Message.rb

@@ -0,0 +1,10 @@
+class Monitor_Message
+    attr_reader :payload
+
+    @payload
+
+    def initialize( payload )
+        @payload = payload
+    end
+    
+end

data/lib/rservicebus/Monitor/XmlDir.rb

@@ -0,0 +1,12 @@
+require 'rservicebus/Monitor/Dir'
+require 'xmlsimple'
+
+class Monitor_XmlDir<Monitor_Dir
+
+
+    def ProcessPath( path )
+        #        return Nokogiri::XML( File.open(path) )
+        return XmlSimple.xml_in( path )
+    end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus
 version: !ruby/object:Gem::Version
-  version: 0.0.41
+  version: 0.0.42
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-05 00:00:00.000000000 Z
+date: 2013-03-09 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby interpretation of NServiceBus
 email: guy@guyirvine.com
@@ -36,6 +36,7 @@ files:
 - lib/rservicebus/AppResource.rb
 - lib/rservicebus/Config.rb
 - lib/rservicebus/ConfigureAppResource.rb
+- lib/rservicebus/ConfigureMonitor.rb
 - lib/rservicebus/ConfigureMQ.rb
 - lib/rservicebus/ConfigureSubscriptionStorage.rb
 - lib/rservicebus/ErrorMessage.rb
@@ -44,6 +45,12 @@ files:
 - lib/rservicebus/Host.rb
 - lib/rservicebus/Message/Subscription.rb
 - lib/rservicebus/Message.rb
+- lib/rservicebus/Monitor/CsvDir.rb
+- lib/rservicebus/Monitor/CsvPerLine.rb
+- lib/rservicebus/Monitor/Dir.rb
+- lib/rservicebus/Monitor/Message.rb
+- lib/rservicebus/Monitor/XmlDir.rb
+- lib/rservicebus/Monitor.rb
 - lib/rservicebus/MQ/Beanstalk.rb
 - lib/rservicebus/MQ/Bunny.rb
 - lib/rservicebus/MQ.rb