promiscuous 0.6.2 → 0.6.3

data/lib/promiscuous/version.rb

@@ -1,3 +1,3 @@
 module Promiscuous
-  VERSION = '0.6.2'
+  VERSION = '0.6.3'
 end

data/lib/promiscuous/worker.rb

@@ -1,33 +1,22 @@
 module Promiscuous
   module Worker
-    def self.replicate
-      stop = false
-      lock = Mutex.new
+    mattr_accessor :stop
 
-      unless ENV['TEST_ENV']
-        %w(SIGTERM SIGINT).each do |signal|
-          Signal.trap(signal) do
-            lock.synchronize do
-              stop = true
-              EM.stop
-            end
-          end
-        end
-      end
+    def self.replicate
+      self.stop = false
+      self.trap_signals unless ENV['TEST_ENV']
 
       Promiscuous::AMQP.subscribe(subscribe_options) do |metadata, payload|
         begin
-          lock.synchronize do
-            unless stop
-              Promiscuous.info "[receive] #{payload}"
-              Promiscuous::Subscriber.process(JSON.parse(payload))
-              metadata.ack
-            end
+          unless self.stop
+            Promiscuous.info "[receive] #{payload}"
+            self.mongoid_wrapper { Promiscuous::Subscriber.process(JSON.parse(payload)) }
+            metadata.ack
           end
         rescue Exception => e
           e = Promiscuous::Subscriber::Error.new(e, payload)
 
-          stop = true
+          self.stop = true
           Promiscuous::AMQP.disconnect
           Promiscuous.error "[receive] FATAL #{e}"
           Promiscuous::Config.error_handler.call(e) if Promiscuous::Config.error_handler
@@ -35,6 +24,24 @@ module Promiscuous
       end
     end
 
+    def self.mongoid_wrapper
+      if defined?(Mongoid)
+        Mongoid.unit_of_work { yield }
+      else
+        yield
+      end
+    end
+
+    def self.trap_signals
+      %w(SIGTERM SIGINT).each do |signal|
+        Signal.trap(signal) do
+          self.stop = true
+          EM.stop
+          Promiscuous.info "exiting gracefully"
+        end
+      end
+    end
+
     def self.subscribe_options
       queue_name = "#{Promiscuous::Config.app}.promiscuous"
       bindings = Promiscuous::Subscriber.subscribers.keys

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promiscuous
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -135,8 +135,8 @@ files:
 - lib/promiscuous/subscriber/mongoid/root.rb
 - lib/promiscuous/subscriber/mongoid/upsert.rb
 - lib/promiscuous/subscriber/polymorphic.rb
-- lib/promiscuous/worker.rb
 - lib/promiscuous/config.rb
+- lib/promiscuous/worker.rb
 - lib/promiscuous/version.rb
 - README.md
 homepage: http://github.com/crowdtap/promiscuous