rservicebus 0.1.38 → 0.1.39

data/lib/rservicebus/CronManager.rb

@@ -47,7 +47,7 @@ class CronManager
             hash['cron'] = CronParser.new(cron_string)
             hash['next'] = hash['cron'].next(Time.now)
             @list << hash
-            @Bus.log( "Cron set for, #{name}, #{cron_string}" )
+            @Bus.log( "Cron set for, #{n}, #{cron_string}" )
         end
     end
     

data/lib/rservicebus/Host.rb

@@ -149,7 +149,7 @@ module RServiceBus
         #Initialise statistics monitor
         #
         def configureStatistics
-            @stats = Stats.new
+            @stats = StatisticManager.new( self )
             
             return self
         end
@@ -204,20 +204,14 @@ module RServiceBus
         # - Most of this should be queue independant
         def StartListeningToEndpoints
             log "Waiting for messages. To exit press CTRL+C"
-            statOutputCountdown = 0
+            #            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
-                    if statOutputCountdown == 0 then
-                        log @stats.getForReporting, true
-                        #                        log @handlerManager.getStats, true
-                        statOutputCountdown = @config.statOutputCountdown
-                        GC.start
-                    end
-                    statOutputCountdown = statOutputCountdown - 1
+                    @stats.tick
                     
                     if @circuitBreaker.Broken then
                         sleep 0.5
@@ -230,7 +224,12 @@ module RServiceBus
                         @msg = YAML::load(body)
                         if @msg.msg.class.name == "RServiceBus::Message_Subscription" then
                             @subscriptionManager.add( @msg.msg.eventName, @msg.returnAddress )
-                            
+                        elsif @msg.msg.class.name == "RServiceBus::Message_StatisticOutputOn" then
+                            @stats.output = true
+                        elsif @msg.msg.class.name == "RServiceBus::Message_StatisticOutputOff" then
+                            @stats.output = false
+                        
+
                             else
                             self.HandleMessage()
                             if !@config.forwardReceivedMessagesTo.nil? then

data/lib/rservicebus/Message/StatisticOutput.rb

@@ -0,0 +1,10 @@
+module RServiceBus
+
+
+class Message_StatisticOutputOn
+end
+
+class Message_StatisticOutputOff
+end
+
+end

data/lib/rservicebus/StateManager.rb

@@ -21,17 +21,17 @@ module RServiceBus
         
         #Start
         def Begin
-            @stateStorage.Begin
+            @stateStorage.Begin unless @stateStorage.nil?
         end
 
         #Get
         def Get( handler )
-            return @stateStorage.Get( handler )
+            return @stateStorage.Get( handler ) unless @stateStorage.nil?
         end
         
         #Finish
         def Commit
-            @stateStorage.Commit
+            @stateStorage.Commit unless @stateStorage.nil?
         end
 
 

data/lib/rservicebus/StatisticManager.rb

@@ -0,0 +1,101 @@
+module RServiceBus
+
+#Used to collect various run time stats for runtime reporting
+class StatisticManager
+
+    attr_accessor :output
+
+	def initialize( host )
+        @host = host
+		@hash = Hash.new
+
+		@totalProcessed = 0
+		@totalErrored = 0
+		@totalSent = 0
+		@totalPublished = 0
+		@totalReply = 0
+
+		@totalByMessageType = Hash.new
+        
+        @output = !RServiceBus.getValue( "VERBOSE", nil ).nil?
+        @maxStatOutputCountdown = RServiceBus.getValue( "STAT_OUTPUT_COUNTDOWN", "1" ).to_i
+        @statOutputCountdown = 0
+	end
+
+	def incTotalProcessed
+		@totalProcessed = @totalProcessed + 1
+	end
+
+	def incTotalErrored
+		@totalErrored = @totalErrored + 1
+	end
+
+	def incTotalSent
+		@totalSent = @totalSent + 1
+	end
+
+	def incTotalPublished
+		@totalPublished = @totalPublished + 1
+	end
+
+	def incTotalReply
+		@totalReply = @totalReply + 1
+	end
+
+	def inc( key )
+		if @hash[key].nil? then
+			@hash[key] = 0
+		end
+		@hash[key] = @hash[key] + 1
+	end
+
+	def incMessageType( className )
+		if @totalByMessageType[className].nil? then
+			@totalByMessageType[className] = 1
+		else
+			@totalByMessageType[className] = @totalByMessageType[className] + 1
+		end
+
+	end
+
+	def getForReporting2
+        if @written == false then
+            @written = true
+            types = Hash.new(0)
+            ObjectSpace.each_object do|obj|
+                types[obj.class]+=1
+            end
+
+            return types
+        end
+    end
+
+    def getForReporting9
+		string = "T:#{@totalProcessed};E:#{@totalErrored};S:#{@totalSent};P:#{@totalPublished};R:#{@totalReply}"
+
+#		if @hash.length > 0 then
+#			@hash.each do |k,v|
+#				string = "#{string};#{k}:#{v}"
+#			end
+#		end
+		
+		return string
+	end
+
+    def report
+        if @output then
+            @host.log( self.getForReporting9 )
+        end
+    end
+
+    def tick
+        @statOutputCountdown = @statOutputCountdown - 1
+        if @statOutputCountdown <= 0 then
+            self.report
+            @statOutputCountdown = @maxStatOutputCountdown
+        end
+    end
+end
+
+
+end

data/lib/rservicebus/helper_functions.rb

@@ -16,7 +16,7 @@ module RServiceBus
 
 	def RServiceBus.log(string, ver=false)
         return unless ENV['TESTING'].nil?
-        
+    
 		type = ver ? "VERB" : "INFO"
         #		if @config.verbose || !ver then
         timestamp = Time.new.strftime( "%Y-%m-%d %H:%M:%S" )

data/lib/rservicebus.rb

@@ -20,10 +20,12 @@ require "rservicebus/Host"
 require "rservicebus/Config"
 require "rservicebus/EndpointMapping"
 require "rservicebus/Stats"
+require "rservicebus/StatisticManager"
 require "rservicebus/Audit"
 
 require "rservicebus/Message"
 require "rservicebus/Message/Subscription"
+require "rservicebus/Message/StatisticOutput"
 
 require "rservicebus/UserMessage/WithPayload"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus
 version: !ruby/object:Gem::Version
-  version: 0.1.38
+  version: 0.1.39
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-06 00:00:00.000000000 Z
+date: 2013-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &70171533967040 !ruby/object:Gem::Requirement
+  requirement: &70165036020780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70171533967040
+  version_requirements: *70165036020780
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70171533966500 !ruby/object:Gem::Requirement
+  requirement: &70165036020300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70171533966500
+  version_requirements: *70165036020300
 - !ruby/object:Gem::Dependency
   name: beanstalk-client
-  requirement: &70171533965880 !ruby/object:Gem::Requirement
+  requirement: &70165036019860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70171533965880
+  version_requirements: *70165036019860
 - !ruby/object:Gem::Dependency
   name: fluiddb
-  requirement: &70171533965340 !ruby/object:Gem::Requirement
+  requirement: &70165036019420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70171533965340
+  version_requirements: *70165036019420
 - !ruby/object:Gem::Dependency
   name: parse-cron
-  requirement: &70171533964680 !ruby/object:Gem::Requirement
+  requirement: &70165036018900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70171533964680
+  version_requirements: *70165036018900
 description: A Ruby interpretation of NServiceBus
 email: guy@guyirvine.com
 executables:
@@ -108,6 +108,7 @@ files:
 - lib/rservicebus/HandlerManager.rb
 - lib/rservicebus/helper_functions.rb
 - lib/rservicebus/Host.rb
+- lib/rservicebus/Message/StatisticOutput.rb
 - lib/rservicebus/Message/Subscription.rb
 - lib/rservicebus/Message.rb
 - lib/rservicebus/Monitor/CsvDir.rb
@@ -123,6 +124,7 @@ files:
 - lib/rservicebus/StateManager.rb
 - lib/rservicebus/StateStorage/Dir.rb
 - lib/rservicebus/StateStorage.rb
+- lib/rservicebus/StatisticManager.rb
 - lib/rservicebus/Stats.rb
 - lib/rservicebus/SubscriptionManager.rb
 - lib/rservicebus/SubscriptionStorage/File.rb