promiscuous 0.53.0 → 0.53.1

data/lib/promiscuous/config.rb

@@ -16,16 +16,21 @@ module Promiscuous::Config
   def self.configure(&block)
     block.call(self)
 
-    self.app ||= Rails.application.class.parent_name.underscore rescue nil if defined?(Rails)
+    self.app           ||= Rails.application.class.parent_name.underscore rescue nil if defined?(Rails)
+    self.amqp_url      ||= 'amqp://guest:guest@localhost:5672'
+    self.redis_url     ||= 'redis://localhost/'
+    self.backend       ||= :rubyamqp
+    self.queue_options ||= {:durable => true, :arguments => {'x-ha-policy' => 'all'}}
+    self.heartbeat     ||= 60
+    self.prefetch      ||= 1000
+    self.logger        ||= defined?(Rails) ? Rails.logger : Logger.new(STDERR).tap { |l| l.level = Logger::WARN }
+
     unless self.app
       raise "Promiscuous.configure: please give a name to your app with \"config.app = 'your_app_name'\""
     end
-    self.backend ||= :rubyamqp # amqp connection is done in Promiscuous::AMQP
+
+    # amqp connection is done in when setting the backend
     Promiscuous::Redis.connect
-    self.logger ||= defined?(Rails) ? Rails.logger : Logger.new(STDERR).tap { |l| l.level = Logger::WARN }
-    self.queue_options ||= {:durable => true, :arguments => {'x-ha-policy' => 'all'}}
-    self.heartbeat ||= 60
-    self.prefetch ||= 1000
   end
 
   def self.configured?

data/lib/promiscuous/subscriber/worker.rb

@@ -8,6 +8,16 @@ class Promiscuous::Subscriber::Worker < Celluloid::SupervisionGroup
   pool      Runner,              :as => :runners, :size => 10
   supervise MessageSynchronizer, :as => :message_synchronizer
   supervise Pump,                :as => :pump
+
+  def finalize
+    # The order matters as actors depend on each other.
+    # This is fixed in the new celluloid, but the gem is not published yet.
+    [:pump, :message_synchronizer, :runners].each do |actor_name|
+      Celluloid::Actor[actor_name].terminate
+    end
+  end
 end
 
+# Find a better place to put this
 Celluloid.exception_handler { |e| Promiscuous::Config.error_notifier.try(:call, e) }
+Celluloid.logger = Promiscuous::Config.logger

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

@@ -31,7 +31,7 @@ class Promiscuous::Subscriber::Worker::Message
   def ack
     EM.next_tick do
       begin
-        metadata.ack
+        metadata.ack if metadata.channel.open?
       rescue
         # We don't care if we fail, the message will be redelivered at some point
       end

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

@@ -8,7 +8,7 @@ class Promiscuous::Subscriber::Worker::MessageSynchronizer
 
   def initialize
     connect
-    main_loop!
+    async.main_loop
   end
 
   def stop
@@ -171,7 +171,7 @@ class Promiscuous::Subscriber::Worker::MessageSynchronizer
 
   def process_message!(msg)
     @queued_messages -= 1
-    Celluloid::Actor[:runners].process!(msg)
+    Celluloid::Actor[:runners].async.process(msg)
   end
 
   def on_version(key, version, &callback)

data/lib/promiscuous/version.rb

@@ -1,3 +1,3 @@
 module Promiscuous
-  VERSION = '0.53.0'
+  VERSION = '0.53.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promiscuous
 version: !ruby/object:Gem::Version
-  version: 0.53.0
+  version: 0.53.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-09 00:00:00.000000000 Z
+date: 2013-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -217,9 +217,9 @@ files:
 - lib/promiscuous/subscriber/mongoid/embedded_many.rb
 - lib/promiscuous/subscriber/mongoid/embedded.rb
 - lib/promiscuous/subscriber/worker/runner.rb
+- lib/promiscuous/subscriber/worker/pump.rb
 - lib/promiscuous/subscriber/worker/message.rb
 - lib/promiscuous/subscriber/worker/message_synchronizer.rb
-- lib/promiscuous/subscriber/worker/pump.rb
 - lib/promiscuous/subscriber/active_record.rb
 - lib/promiscuous/subscriber/envelope.rb
 - lib/promiscuous/subscriber/upsert.rb
@@ -248,9 +248,9 @@ files:
 - lib/promiscuous/redis.rb
 - lib/promiscuous/observer.rb
 - lib/promiscuous/error.rb
-- lib/promiscuous/config.rb
 - lib/promiscuous/amqp.rb
 - lib/promiscuous/cli.rb
+- lib/promiscuous/config.rb
 - lib/promiscuous/version.rb
 - lib/promiscuous.rb
 - bin/promiscuous