ribbon-event_bus 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd26c9dead029e9b0486e8ba596468db76fb7bb3
-  data.tar.gz: 0051194033a07c691886ce03b1f9a2ff07f83a94
+  metadata.gz: a4e3cc06e8e927ee8d9699026ce5616dc2596121
+  data.tar.gz: e826ceefcec880ea0afcdc15c7a7f055c5496176
 SHA512:
-  metadata.gz: 0b42f285a3fbca1401bff8810282a38c3392da3d56a03c9c594cd2fc2c93556a55a403ed0ab943f05bc96f040d1b90b4741e2c0b61e3e630c41a64a4d3d93c84
-  data.tar.gz: 2757b6055e37f0bb290d3ff98ee279d955f947f75a9de935c310ae2c91b7f5d16f9f4bf4affd2c6f917be3929901aa057f5a2a5818a94367ed858142f23ecc39
+  metadata.gz: 8df0d797c59cf738ef4fad03df797a9d71ad5c2bdac7cb16e2aec7f1a8870a7741196a4b051f3ddfa9f1cebe0397ddb0e45e37ea9c30c8c78f08ac41860c4d30
+  data.tar.gz: 267e799cd369659d1d209e1f12362a2fd2287ed757a602b2c6eb1928fd2a13427a8832ec7b3bf710a2c8da1c31b8847e8575ae02bffe82b377c655ba93f9b75b

data/lib/ribbon/event_bus/instance.rb

@@ -157,4 +157,4 @@ module Ribbon
       end
     end # Instance
   end # EventBus
-end # Ribbon
+end # Ribbon

data/lib/ribbon/event_bus/publishers/async_resque_publisher.rb

@@ -0,0 +1,78 @@
+require 'resque'
+require 'redis'
+require 'celluloid/current'
+
+module Ribbon::EventBus
+  module Publishers
+    class AsyncResquePublisher < Publisher
+      config_key :resque
+
+      attr_reader :resque
+
+      def initialize(instance=nil, params={})
+        super
+        @resque = config.resque? ? config.resque : Resque
+        PublisherWorker.supervise(args: [self], as: worker_id)
+      end
+
+      def worker_id
+        @__worker_id ||= "event_bus_resque_worker_#{object_id}".to_sym
+      end
+
+      ##
+      # The suprvisor created in the initializer will restart the PublisherWorker
+      # but there can be a short period of time when the actor returned by
+      # Celluloid::Actor[...] is dead. To avoid that we sleep for a millisecond
+      # to give it time to create a new worker thread.  We try three times before
+      # giving up.
+      #
+      # This should ensure that it's unlikely for a dead worker to be returned.
+      # However, if a dead worker is returned, then async calls will silently
+      # fail, allowing normal execution. This makes firing events best-effort.
+      def worker
+        w = Celluloid::Actor[worker_id]
+
+        3.times {
+          if w.dead?
+            sleep(0.001)
+            w = Celluloid::Actor[worker_id]
+          else
+            break
+          end
+        }
+
+        w
+      end
+
+      ##
+      # Needs to exist for the ResquePublisher::PublisherJob to succeed.
+      def subscription_queue_formatter
+        ResquePublisher.subscription_queue_formatter(config)
+      end
+
+      def publish(event)
+        super
+        worker.async.publish(event) unless event.subscriptions.empty?
+      end
+
+      class PublisherWorker
+        include Celluloid
+
+        attr_reader :publisher
+
+        def initialize(publisher)
+          @publisher = publisher
+        end
+
+        def publish(event)
+          publisher.resque.enqueue_to(
+            publisher.config.publisher_queue.to_sym,
+            ResquePublisher::PublisherJob,
+            event.serialize,
+            :async_resque
+          )
+        end
+      end # PublisherWorker
+    end
+  end
+end

data/lib/ribbon/event_bus/publishers/publisher.rb

@@ -27,4 +27,4 @@ module Ribbon::EventBus
       end
     end
   end
-end
+end

data/lib/ribbon/event_bus/publishers/resque_publisher.rb

@@ -20,31 +20,37 @@ module Ribbon::EventBus
       end
 
       def subscription_queue_formatter
-        if config.subscription_queue_formatter?
-          formatter = config.subscription_queue_formatter
-          case formatter
-          when Array
-            formatter.last
-          when Proc
-            formatter
+        self.class.subscription_queue_formatter(config)
+      end
+
+      class << self
+        def subscription_queue_formatter(config)
+          if config.subscription_queue_formatter?
+            formatter = config.subscription_queue_formatter
+            case formatter
+            when Array
+              formatter.last
+            when Proc
+              formatter
+            else
+              raise Errors::PublisherError, "Invalid subscription_queue_formatter: #{formatter.inspect}"
+            end
           else
-            raise Errors::PublisherError, "Invalid subscription_queue_formatter: #{formatter.inspect}"
+            lambda { |subscription| "subscriptions_p#{subscription.priority}" }
           end
-        else
-          lambda { |subscription| "subscriptions_p#{subscription.priority}" }
         end
-      end
+      end # Class Methods
 
       module PublisherJob
         def self.set_queue(queue)
           @queue = queue
         end
 
-        def self.perform(serialized_event)
+        def self.perform(serialized_event, publisher_name=:resque)
           event = Event.deserialize(serialized_event)
           instance = event.instance
 
-          publisher = instance.find_publisher(:resque)
+          publisher = instance.find_publisher(publisher_name)
           raise Errors::PublisherError, 'No ResquePublisher found' unless publisher
           queue_formatter = publisher.subscription_queue_formatter
 
@@ -78,4 +84,4 @@ module Ribbon::EventBus
       end
     end
   end
-end
+end

data/lib/ribbon/event_bus/publishers.rb

@@ -10,6 +10,8 @@ module Ribbon::EventBus
       'ribbon/event_bus/publishers/resque_publisher')
     autoload(:RemoteResquePublisher,
       'ribbon/event_bus/publishers/remote_resque_publisher')
+    autoload(:AsyncResquePublisher,
+      'ribbon/event_bus/publishers/async_resque_publisher')
 
     module_function
     def load_for_instance(instance)
@@ -49,4 +51,4 @@ module Ribbon::EventBus
       ProcPublisher.new(&publisher_proc)
     end
   end
-end
+end

data/lib/ribbon/event_bus/version.rb

@@ -1,5 +1,5 @@
 module Ribbon
   module EventBus
-    VERSION = "0.4.0"
+    VERSION = "0.5.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ribbon-event_bus
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Robert Honer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ribbon-plugins
@@ -30,6 +30,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.4
+- !ruby/object:Gem::Dependency
+  name: celluloid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.17.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.17.2
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -163,6 +177,7 @@ files:
 - lib/ribbon/event_bus/plugins/logging_plugin.rb
 - lib/ribbon/event_bus/plugins/plugin.rb
 - lib/ribbon/event_bus/publishers.rb
+- lib/ribbon/event_bus/publishers/async_resque_publisher.rb
 - lib/ribbon/event_bus/publishers/proc_publisher.rb
 - lib/ribbon/event_bus/publishers/publisher.rb
 - lib/ribbon/event_bus/publishers/remote_resque_publisher.rb