rservicebus 0.1.66 → 0.1.67

data/lib/rservicebus/Host.rb

@@ -13,25 +13,25 @@ module RServiceBus
     #Host process for rservicebus
     class Host
         attr_accessor :sagaData
-        
+
         @sagaData
-        
+
         @handlerList
         @resourceListByHandlerName
-        
+
         @subscriptions
-        
+
         @mq
-        
+
         @resourceManager
-        
+
         @config
-        
+
         @subscriptionManager
-        
+
         @stats
-        
-        
+
+
         @queueForMsgsToBeSentOnComplete
 
 
@@ -49,8 +49,8 @@ module RServiceBus
             @resourceManager = ConfigureAppResource.new.getResources( ENV, self, @stateManager, @sagaStorage )
             return self;
         end
-        
-        
+
+
         #Thin veneer for Configuring SendAt
         #
         def configureSendAtManager
@@ -64,7 +64,7 @@ module RServiceBus
             @stateManager = StateManager.new
             return self;
         end
-        
+
         #Thin veneer for Configuring state
         #
         def configureSagaStorage
@@ -84,20 +84,20 @@ module RServiceBus
             @circuitBreaker = CircuitBreaker.new( self )
             return self;
         end
-        
-        
+
+
         #Thin veneer for Configuring external resources
         #
         def configureMonitors
             @monitors = ConfigureMonitor.new( self, @resourceManager ).getMonitors( ENV )
             return self;
         end
-        
+
         #Thin veneer for Configuring the Message Queue
         #
         def connectToMq
             @mq = MQ.get
-            
+
             return self
         end
 
@@ -105,91 +105,91 @@ module RServiceBus
         #msg endpoint mapping
         def sendSubscriptions
             log "Send Subscriptions"
-            
+
             @endpointMapping.getSubscriptionEndpoints.each { |eventName| self.Subscribe( eventName ) }
-            
+
             return self
         end
-        
+
         #Load and configure Message Handlers
         #
         def loadHandlers()
             log "Load Message Handlers"
             @handlerManager = HandlerManager.new( self, @resourceManager, @stateManager )
             @handlerLoader = HandlerLoader.new( self, @handlerManager )
-            
+
             @config.handlerPathList.each do |path|
                 @handlerLoader.loadHandlersFromPath(path)
             end
-            
+
             return self
         end
-        
+
         #Load and configure Sagas
         def loadSagas()
             log "Load Sagas"
             @sagaManager = Saga_Manager.new( self, @resourceManager, @sagaStorage )
             @sagaLoader = SagaLoader.new( self, @sagaManager )
-            
+
             @config.sagaPathList.each do |path|
                 @sagaLoader.loadSagasFromPath(path)
             end
-            
+
             return self
         end
-        
+
         #Thin veneer for Configuring Cron
         #
         def configureCronManager
             @cronManager = CronManager.new( self, @handlerManager.getListOfMsgNames )
             return self;
         end
-        
+
         #Load Contracts
         #
         def loadContracts()
             log "Load Contracts"
-            
+
             @config.contractList.each do |path|
                 require path
                 RServiceBus.rlog "Loaded Contract: #{path}"
             end
-            
+
             return self
         end
-        
+
         #For each directory given, find and load all librarys
         #
         def loadLibs()
             log "Load Libs"
-            
+
             @config.libList.each do |path|
                 $:.unshift path
             end
-            
+
             return self
         end
-        
+
         #Load, configure and initialise Subscriptions
         #
         def configureSubscriptions
             subscriptionStorage = ConfigureSubscriptionStorage.new.get( @config.appName, @config.subscriptionUri )
             @subscriptionManager = SubscriptionManager.new( subscriptionStorage )
-            
+
             return self
         end
-        
+
         #Initialise statistics monitor
         #
         def configureStatistics
             @stats = StatisticManager.new( self )
-            
+
             return self
         end
-        
+
         def initialize()
             RServiceBus.rlog "Current directory: #{Dir.pwd}"
-            
+
             @config = ConfigFromEnv.new
 			.loadHostSection()
 			.loadContracts()
@@ -197,11 +197,11 @@ module RServiceBus
             .loadSagaPathList()
             .loadLibs()
             .loadWorkingDirList();
-            
+
             self.connectToMq()
-            
+
             @endpointMapping = EndpointMapping.new.Configure( @mq.localQueueName )
-            
+
             self.configureStatistics()
             .loadContracts()
             .loadLibs()
@@ -216,16 +216,16 @@ module RServiceBus
             .configureCronManager()
 			.configureSubscriptions()
 			.sendSubscriptions()
-            
-            
+
+
             return self
         end
-        
+
         #Ignition
         #
         def run
             log "Starting the Host"
-            
+
             log "Watching, #{@mq.localQueueName}"
             $0 = "rservicebus - #{@mq.localQueueName}"
             if !@config.forwardReceivedMessagesTo.nil? then
@@ -234,10 +234,10 @@ module RServiceBus
             if !@config.forwardSentMessagesTo.nil? then
                 log "Forwarding all sent messages to: " + @config.forwardSentMessagesTo.to_s
             end
-            
+
             self.StartListeningToEndpoints
         end
-        
+
         #Receive a msg, prep it, and handle any errors that may occur
         # - Most of this should be queue independant
         def StartListeningToEndpoints
@@ -245,17 +245,17 @@ module RServiceBus
             #            statOutputCountdown = 0
             messageLoop = true
             retries = @config.maxRetries
-            
+
             while messageLoop do
                 #Popping a msg off the queue should not be in the message handler, as it affects retry
                 begin
                     @stats.tick
-                    
+
                     if @circuitBreaker.Broken then
                         sleep 0.5
                         next
                     end
-                    
+
                     body = @mq.pop
                     begin
                         @stats.incTotalProcessed
@@ -274,12 +274,12 @@ module RServiceBus
                             elsif @msg.msg.class.name == "RServiceBus::Message_VerboseOutputOff" then
                             ENV.delete( "VERBOSE" )
                             log "Turn off Verbose logging"
-                            
-                            
+
+
                             else
-                            
+
                             self.HandleMessage()
-                            
+
                             if !@config.forwardReceivedMessagesTo.nil? then
                                 self._SendAlreadyWrappedAndSerialised(body,@config.forwardReceivedMessagesTo)
                             end
@@ -288,59 +288,59 @@ module RServiceBus
                         rescue ClassNotFoundForMsg => e
                         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( @mq.localQueueName, e.message )
                         serialized_object = YAML::dump(@msg)
                         self._SendAlreadyWrappedAndSerialised(serialized_object, @config.errorQueueName)
                         @mq.ack
-                        
+
                         rescue NoHandlerFound => e
                         puts "*** Handler not found for msg, #{e.message}"
                         puts "*** Ensure a handler named, #{e.message}, is present in the MessageHandler directory."
-                        
+
                         @msg.addErrorMsg( @mq.localQueueName, e.message )
                         serialized_object = YAML::dump(@msg)
                         self._SendAlreadyWrappedAndSerialised(serialized_object, @config.errorQueueName)
                         @mq.ack
-                        
+
                         rescue PropertyNotSet => e
                         #This has been re-rasied from a rescue in the handler
                         puts "*** #{e.message}"
                         #"Property, #{e.message}, not set for, #{handler.class.name}"
                         propertyName = e.message[10, e.message.index(",", 10)-10]
-                        puts "*** Ensure the environemnt variable, RSB_#{propertyName}, has been set at startup."
-                        
+                        puts "*** Ensure the environment variable, RSB_#{propertyName}, has been set at startup."
+
                         rescue Exception => e
                         sleep 0.5
-                        
+
                         puts "*** Exception occurred"
                         puts e.message
                         puts e.backtrace
                         puts "***"
-                        
+
                         if retries > 0 then
                             retries = retries - 1
                             @mq.returnToQueue
                             else
-                            
+
                             @circuitBreaker.Failure
-                            
+
                             @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( @mq.localQueueName, errorString )
                             serialized_object = YAML::dump(@msg)
                             self._SendAlreadyWrappedAndSerialised(serialized_object, @config.errorQueueName)
@@ -351,7 +351,7 @@ module RServiceBus
                     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
@@ -361,7 +361,7 @@ module RServiceBus
                     end
                     self.sendQueuedMsgs
                     @queueForMsgsToBeSentOnComplete = nil
-                    
+
                     @queueForMsgsToBeSentOnComplete = Array.new
                     @cronManager.Run
                     self.sendQueuedMsgs
@@ -372,9 +372,9 @@ module RServiceBus
 
 
                     @circuitBreaker.Success
-                    
+
                     rescue Exception => e
-                    if e.message == "SIGTERM" then
+                    if e.message == "SIGTERM" || e.message == "SIGINT" then
                         puts "Exiting on request ..."
                         messageLoop = false
                         else
@@ -386,19 +386,19 @@ module RServiceBus
                 end
             end
             end
-            
+
             #Send the current msg to the appropriate handlers
             #
             def HandleMessage()
                 @resourceManager.Begin
                 msgName = @msg.msg.class.name
                 handlerList = @handlerManager.getHandlerListForMsg(msgName)
-                
-                
+
+
                 RServiceBus.rlog "Handler found for: " + msgName
                 begin
                     @queueForMsgsToBeSentOnComplete = Array.new
-                    
+
                     log "Started processing msg, #{msgName}"
                     handlerList.each do |handler|
                         begin
@@ -413,42 +413,42 @@ module RServiceBus
                             raise e
                         end
                     end
-                    
-                    
+
+
                     if @sagaManager.Handle( @msg ) == false && handlerList.length == 0 then
                         raise NoHandlerFound.new( msgName )
                     end
-                    
-                    
-                    
+
+
+
                     @resourceManager.Commit( msgName )
-                    
+
                     self.sendQueuedMsgs
                     log "Finished processing msg, #{msgName}"
-                    
+
                     rescue Exception => e
-                    
+
                     @resourceManager.Rollback( msgName )
                     @queueForMsgsToBeSentOnComplete = nil
-                    
+
                     raise e
                 end
             end
-            
+
             #######################################################################################################
             # All msg sending Methods
-            
+
             #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 )
                 RServiceBus.rlog "Bus._SendAlreadyWrappedAndSerialised"
-                
+
                 if !@config.forwardSentMessagesTo.nil? then
                     @mq.send( @config.forwardSentMessagesTo, serialized_object )
                 end
-                
+
                 @mq.send( queueName, serialized_object )
             end
 
@@ -470,7 +470,7 @@ module RServiceBus
                     q = 'transport-out'
                     RServiceBus.rlog "Sending, #{msg.class.name} to, #{queueName}, via #{q}"
                 end
-                
+
                 serialized_object = YAML::dump(rMsg)
                 self._SendAlreadyWrappedAndSerialised( serialized_object, q )
             end
@@ -499,22 +499,22 @@ module RServiceBus
             def Reply( msg )
                 RServiceBus.rlog "Reply with: " + msg.class.name + " To: " + @msg.returnAddress
                 @stats.incTotalReply
-                
+
                 self.queueMsgForSendOnComplete( msg, @msg.returnAddress )
             end
-            
+
             def getEndpointForMsg( msgName )
                 queueName = @endpointMapping.get( msgName )
                 return queueName unless queueName.nil?
-                
+
                 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
                 raise "No end point mapping found for: " + msgName
             end
-            
-            
+
+
             #Send a msg across the bus
             #msg destination is specified at the infrastructure level
             #
@@ -525,7 +525,7 @@ module RServiceBus
 
                 msgName = msg.class.name
                 queueName = self.getEndpointForMsg( msgName )
-                
+
                 self.queueMsgForSendOnComplete( msg, queueName, timestamp )
             end
 
@@ -535,12 +535,12 @@ module RServiceBus
             def Publish( msg )
                 RServiceBus.rlog "Bus.Publish"
                 @stats.incTotalPublished
-                
+
                 subscriptions = @subscriptionManager.get(msg.class.name)
                 subscriptions.each do |subscriber|
                     self.queueMsgForSendOnComplete( msg, subscriber )
                 end
-                
+
             end
 
             #Sends a subscription request across the Bus
@@ -548,13 +548,13 @@ module RServiceBus
             # @param [String] eventName event to be subscribes to
             def Subscribe( eventName )
                 RServiceBus.rlog "Bus.Subscribe: " + eventName
-                
+
                 queueName = self.getEndpointForMsg( eventName )
                 subscription = Message_Subscription.new( eventName )
-                
+
                 self._SendNeedsWrapping( subscription, queueName, nil )
             end
-            
+
         end
-        
+
     end

data/lib/rservicebus/Monitor/CsvDir.rb

@@ -3,8 +3,9 @@ require 'csv'
 
 module RServiceBus
     
+
     class Monitor_CsvDir<Monitor_Dir
-        
+
 
         def checkPayloadForNumberOfColumns( payload )
             return if @QueryStringParts.nil?

data/lib/rservicebus/Monitor/Dir.rb

@@ -145,7 +145,6 @@ module RServiceBus
                 
                 fileProcessed = fileProcessed + 1
                 RServiceBus.log "Processed #{fileProcessed} of #{fileList.length}."
-                RServiceBus.log "Allow system tick #{self.class.name}"
                 return if fileProcessed >= maxFilesProcessed
             end
             

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus
 version: !ruby/object:Gem::Version
-  version: 0.1.66
+  version: 0.1.67
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &70249047240880 !ruby/object:Gem::Requirement
+  requirement: &70158534691240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70249047240880
+  version_requirements: *70158534691240
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70249047258580 !ruby/object:Gem::Requirement
+  requirement: &70158534690800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70249047258580
+  version_requirements: *70158534690800
 - !ruby/object:Gem::Dependency
   name: beanstalk-client
-  requirement: &70249047255440 !ruby/object:Gem::Requirement
+  requirement: &70158534690380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70249047255440
+  version_requirements: *70158534690380
 - !ruby/object:Gem::Dependency
   name: fluiddb
-  requirement: &70249047252340 !ruby/object:Gem::Requirement
+  requirement: &70158534689960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70249047252340
+  version_requirements: *70158534689960
 - !ruby/object:Gem::Dependency
   name: parse-cron
-  requirement: &70249047265180 !ruby/object:Gem::Requirement
+  requirement: &70158534689540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70249047265180
+  version_requirements: *70158534689540
 description: A Ruby interpretation of NServiceBus
 email: guy@guyirvine.com
 executables: