pipeline_toolkit 1.2.20 → 1.2.21

data/lib/pipeline_toolkit/message_subscriber.rb

@@ -15,6 +15,8 @@ module PipelineToolkit
     attr_reader :start_time
     attr_reader :mps
     attr_reader :options
+    attr_reader :total_messages
+    attr_reader :average_mps
     attr_accessor :structure
 
     PIPE_PATH = "/tmp"
@@ -41,6 +43,8 @@ module PipelineToolkit
 
       @structure = [description]
       write_pid(options[:pid_path]) if options[:pid_path]
+      
+      @total_messages = 0
         
       reset_message_statistics
     end
@@ -190,6 +194,7 @@ module PipelineToolkit
       def calculate_message_statistics
         @time_delta = Time.now - @prev_time
         @mps  = @count  / @time_delta
+        @average_mps = @total_messages / uptime
         reset_message_statistics
       end
 
@@ -239,6 +244,7 @@ module PipelineToolkit
       def write(message)
         DefaultLogger.debug("MessageSubscriber#write(#{message.inspect})")
         @count += 1
+        total_messages += 1
         write_to_pipe(message)
       end
 

data/lib/pipeline_toolkit/monitoring/monitor.erb

@@ -48,11 +48,18 @@
           <td>host:</td><td><%= hostname %></td>
         </tr>
         <tr>
-          <td>throughput:</td><td><%= "%.3f" % (mps || 0) %></td>
+          <td>uptime:</td><td><%= uptime / 60 %>mins</td>
         </tr>
         <tr>
-          <td>uptime:</td><td><%= uptime / 60 %>mins</td>
+          <td>total messages:</td><td><%= total_messages %></td>
+        </tr>
+        <tr>
+          <td>average mps:</td><td><%= "%.3f" % (average_mps || 0) %></td>
+        </tr>
+        <tr>
+          <td>current mps:</td><td><%= "%.3f" % (mps || 0) %></td>
         </tr>
+        
     </table>
     </div>
   </body>

data/lib/pipeline_toolkit/monitoring/monitor_server.rb

@@ -51,7 +51,9 @@ module PipelineToolkit
           :host       => @message_subscriber.hostname,
           :structure  => @message_subscriber.structure,
           :throughput => @message_subscriber.mps,
-          :uptime     => @message_subscriber.uptime
+          :uptime     => @message_subscriber.uptime,
+          :total      => @message_subscriber.total_messages,
+          :average_mps => @message_subscriber.average_mps
         }
         response.content = result.to_json
       end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 2
-  - 20
-  version: 1.2.20
+  - 21
+  version: 1.2.21
 platform: ruby
 authors: 
 - Aisha Fenton
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-03 00:00:00 +12:00
+date: 2010-09-06 00:00:00 +12:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency