promiscuous 0.91.0 → 0.92.0

data/lib/promiscuous/subscriber/worker/stats.rb

@@ -37,26 +37,30 @@ class Promiscuous::Subscriber::Worker::Stats
     processed_messages = processed_messages.value.to_i
     total_response_time = total_response_time.value.to_i
 
-    rate = sprintf("%.1f", processed_messages.to_f / (Time.now - last_aggregate))
-    latency = "N/A"
+    rate = processed_messages.to_f / (Time.now - last_aggregate)
+    rate_str = sprintf("%.1f", rate)
+    latency = 0
+    latency_str = "N/A"
     unless processed_messages.zero?
       latency = total_response_time.to_f / (1000 * processed_messages).to_f
       if latency > 2.minutes
-        latency = sprintf("%.3fmin", latency / 1.minute)
+        latency_str = sprintf("%.3fmin", latency / 1.minute)
       else
-        latency = sprintf("%.3fsec", latency)
+        latency_str = sprintf("%.3fsec", latency)
       end
     end
-    STDERR.puts "\e[1A" + "\b" * 200 + "Messages: #{processed_messages}  Rate: #{rate} msg/s  Latency: #{latency}" + " " * 30
+
+    STDERR.puts "\e[1A" + "\b" * 200 + "Messages: Rate: #{rate_str} msg/s  Latency: #{latency_str}" + " " * 30
+    Promiscuous::Config.on_stats.call(rate, latency)
   end
 
   def notify_processed_message(msg, time)
-    return if msg.timestamp.zero? || !@redis
+    return if !@redis
 
     msecs = (time.to_i * 1000 + time.usec / 1000).to_i - msg.timestamp
     @redis.pipelined do
       @redis.incr(@key_processed_message)
-      @redis.incrby(@key_total_response_time, msecs)
+      @redis.incrby(@key_total_response_time, msecs) unless msg.timestamp.zero?
     end
   end
 end

data/lib/promiscuous/version.rb

@@ -1,3 +1,3 @@
 module Promiscuous
-  VERSION = '0.91.0'
+  VERSION = '0.92.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promiscuous
 version: !ruby/object:Gem::Version
-  version: 0.91.0
+  version: 0.92.0
 platform: ruby
 authors:
 - Nicolas Viennot
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-10 00:00:00.000000000 Z
+date: 2014-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -146,86 +146,89 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/promiscuous/amqp/hot_bunnies.rb
-- lib/promiscuous/amqp/null.rb
+- bin/promiscuous
+- lib/promiscuous.rb
+- lib/promiscuous/amqp.rb
 - lib/promiscuous/amqp/bunny.rb
 - lib/promiscuous/amqp/fake.rb
+- lib/promiscuous/amqp/file.rb
+- lib/promiscuous/amqp/hot_bunnies.rb
+- lib/promiscuous/amqp/null.rb
+- lib/promiscuous/autoload.rb
+- lib/promiscuous/cli.rb
+- lib/promiscuous/config.rb
+- lib/promiscuous/convenience.rb
+- lib/promiscuous/dependency.rb
+- lib/promiscuous/dsl.rb
+- lib/promiscuous/error.rb
+- lib/promiscuous/error/base.rb
+- lib/promiscuous/error/connection.rb
+- lib/promiscuous/error/dependency.rb
+- lib/promiscuous/error/lock_unavailable.rb
+- lib/promiscuous/error/lost_lock.rb
+- lib/promiscuous/error/missing_context.rb
+- lib/promiscuous/error/publisher.rb
+- lib/promiscuous/error/recovery.rb
+- lib/promiscuous/error/subscriber.rb
+- lib/promiscuous/key.rb
+- lib/promiscuous/loader.rb
+- lib/promiscuous/mongoid.rb
+- lib/promiscuous/publisher.rb
+- lib/promiscuous/publisher/bootstrap.rb
+- lib/promiscuous/publisher/bootstrap/connection.rb
+- lib/promiscuous/publisher/bootstrap/data.rb
+- lib/promiscuous/publisher/bootstrap/mode.rb
+- lib/promiscuous/publisher/bootstrap/status.rb
+- lib/promiscuous/publisher/bootstrap/version.rb
+- lib/promiscuous/publisher/context.rb
+- lib/promiscuous/publisher/context/base.rb
+- lib/promiscuous/publisher/context/middleware.rb
+- lib/promiscuous/publisher/context/transaction.rb
+- lib/promiscuous/publisher/mock_generator.rb
+- lib/promiscuous/publisher/model.rb
 - lib/promiscuous/publisher/model/active_record.rb
+- lib/promiscuous/publisher/model/base.rb
 - lib/promiscuous/publisher/model/ephemeral.rb
 - lib/promiscuous/publisher/model/mock.rb
 - lib/promiscuous/publisher/model/mongoid.rb
-- lib/promiscuous/publisher/model/base.rb
-- lib/promiscuous/publisher/model.rb
+- lib/promiscuous/publisher/operation.rb
+- lib/promiscuous/publisher/operation/active_record.rb
 - lib/promiscuous/publisher/operation/atomic.rb
 - lib/promiscuous/publisher/operation/base.rb
+- lib/promiscuous/publisher/operation/ephemeral.rb
+- lib/promiscuous/publisher/operation/mongoid.rb
 - lib/promiscuous/publisher/operation/non_persistent.rb
 - lib/promiscuous/publisher/operation/proxy_for_query.rb
 - lib/promiscuous/publisher/operation/transaction.rb
-- lib/promiscuous/publisher/operation/active_record.rb
-- lib/promiscuous/publisher/operation/mongoid.rb
-- lib/promiscuous/publisher/bootstrap/mode.rb
-- lib/promiscuous/publisher/bootstrap/status.rb
-- lib/promiscuous/publisher/bootstrap/data.rb
-- lib/promiscuous/publisher/bootstrap/version.rb
-- lib/promiscuous/publisher/bootstrap/connection.rb
-- lib/promiscuous/publisher/bootstrap.rb
-- lib/promiscuous/publisher/context.rb
-- lib/promiscuous/publisher/context/middleware.rb
-- lib/promiscuous/publisher/context/transaction.rb
-- lib/promiscuous/publisher/context/base.rb
-- lib/promiscuous/publisher/mock_generator.rb
-- lib/promiscuous/publisher/operation.rb
 - lib/promiscuous/publisher/worker.rb
-- lib/promiscuous/subscriber/worker/stats.rb
-- lib/promiscuous/subscriber/worker/message_synchronizer.rb
-- lib/promiscuous/subscriber/worker/message.rb
-- lib/promiscuous/subscriber/worker/recorder.rb
-- lib/promiscuous/subscriber/worker/runner.rb
-- lib/promiscuous/subscriber/worker/pump.rb
-- lib/promiscuous/subscriber/model/active_record.rb
-- lib/promiscuous/subscriber/model/observer.rb
-- lib/promiscuous/subscriber/model/mongoid.rb
-- lib/promiscuous/subscriber/model/base.rb
-- lib/promiscuous/subscriber/model.rb
-- lib/promiscuous/subscriber/worker.rb
+- lib/promiscuous/railtie.rb
+- lib/promiscuous/redis.rb
+- lib/promiscuous/resque.rb
+- lib/promiscuous/sidekiq.rb
+- lib/promiscuous/subscriber.rb
 - lib/promiscuous/subscriber/message_processor.rb
 - lib/promiscuous/subscriber/message_processor/base.rb
 - lib/promiscuous/subscriber/message_processor/bootstrap.rb
 - lib/promiscuous/subscriber/message_processor/regular.rb
+- lib/promiscuous/subscriber/model.rb
+- lib/promiscuous/subscriber/model/active_record.rb
+- lib/promiscuous/subscriber/model/base.rb
+- lib/promiscuous/subscriber/model/mongoid.rb
+- lib/promiscuous/subscriber/model/observer.rb
 - lib/promiscuous/subscriber/operation.rb
-- lib/promiscuous/subscriber/operation/regular.rb
-- lib/promiscuous/subscriber/operation/bootstrap.rb
 - lib/promiscuous/subscriber/operation/base.rb
-- lib/promiscuous/error/already_processed.rb
-- lib/promiscuous/error/base.rb
-- lib/promiscuous/error/lock_unavailable.rb
-- lib/promiscuous/error/lost_lock.rb
-- lib/promiscuous/error/missing_context.rb
-- lib/promiscuous/error/publisher.rb
-- lib/promiscuous/error/recovery.rb
-- lib/promiscuous/error/subscriber.rb
-- lib/promiscuous/error/connection.rb
-- lib/promiscuous/error/dependency.rb
-- lib/promiscuous/autoload.rb
-- lib/promiscuous/dsl.rb
-- lib/promiscuous/error.rb
-- lib/promiscuous/key.rb
-- lib/promiscuous/sidekiq.rb
-- lib/promiscuous/resque.rb
-- lib/promiscuous/publisher.rb
+- lib/promiscuous/subscriber/operation/bootstrap.rb
+- lib/promiscuous/subscriber/operation/regular.rb
+- lib/promiscuous/subscriber/worker.rb
+- lib/promiscuous/subscriber/worker/eventual_destroyer.rb
+- lib/promiscuous/subscriber/worker/message.rb
+- lib/promiscuous/subscriber/worker/message_synchronizer.rb
+- lib/promiscuous/subscriber/worker/pump.rb
+- lib/promiscuous/subscriber/worker/recorder.rb
+- lib/promiscuous/subscriber/worker/runner.rb
+- lib/promiscuous/subscriber/worker/stats.rb
 - lib/promiscuous/timer.rb
-- lib/promiscuous/convenience.rb
-- lib/promiscuous/dependency.rb
-- lib/promiscuous/loader.rb
-- lib/promiscuous/railtie.rb
-- lib/promiscuous/subscriber.rb
-- lib/promiscuous/amqp.rb
-- lib/promiscuous/cli.rb
-- lib/promiscuous/config.rb
-- lib/promiscuous/redis.rb
 - lib/promiscuous/version.rb
-- lib/promiscuous.rb
-- bin/promiscuous
 homepage: http://github.com/crowdtap/promiscuous
 licenses: []
 metadata: {}
@@ -245,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Model replication over RabbitMQ

data/lib/promiscuous/error/already_processed.rb

@@ -1,5 +0,0 @@
-class Promiscuous::Error::AlreadyProcessed < Promiscuous::Error::Base
-  def to_s
-    "Skipping message (already processed)"
-  end
-end