shoryuken-later 0.0.5.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ddee2c4f752e577a58318adb619953bb2f59481
-  data.tar.gz: 15ceff15183b969a80c881efa19ad7682e2b70df
+  metadata.gz: 4ed2b69dae97667b38ef15a0be1ee0f6989e9c95
+  data.tar.gz: 82fa4cb2cb2f763be48094df3f4224a025d56815
 SHA512:
-  metadata.gz: 773be98b8d0268b9d44be8186ce3e3762c33ab7d220fcb14d196c8a781156a5e7bc45189c8d55cd55ace3c6c7666a0ae0c617d9dfd4625ec0048d41132a76a29
-  data.tar.gz: b529a8387cde89f23e8ed5dffd489498eb0e024a82195f5732fb366fe2529369ab83a9c4af4eadf7780c106e107ea188bb5961a783debdd09f52f0398af3fdee
+  metadata.gz: 9f1d6efd2b3521a763e685e65d3c695fa8282ab6f3b0b4b0dc6450d26a0b656ffffaf40057db9bf35cee63ac1f9708715649581ff0094ddf2d0bd707a195cf02
+  data.tar.gz: f5f07fd722f05fc37206b8e4a59e1acf2960282a7656d60275df746458b60bbf0b3be0e2e82d649fd5ae4fefc0875025cfd84d4e839bb45927c20f38453d706a

data/lib/shoryuken/later/cli.rb

@@ -7,6 +7,7 @@ require 'singleton'
 require 'optparse'
 require 'erb'
 require 'shoryuken/later'
+require 'timers'
 
 module Shoryuken
   module Later
@@ -14,8 +15,6 @@ module Shoryuken
       include Shoryuken::Util
       include Singleton
 
-      attr_accessor :launcher
-      
       def run(args)
         self_read, self_write = IO.pipe
 
@@ -34,38 +33,47 @@ module Shoryuken
         validate!
         daemonize
         write_pid
-        load_celluloid
-
-        require 'shoryuken/later/launcher'
-        @launcher = Shoryuken::Later::Launcher.new
-
+        
+        logger.info 'Starting'
+        
+        # Initialize the timers and poller.
+        @timers = Timers::Group.new
+        require 'shoryuken/later/poller'
+        @pollers = Shoryuken::Later.tables.map{|tbl| Poller.new(tbl) }
+          
         begin
-          launcher.run
-
-          while readable_io = IO.select([self_read])
-            signal = readable_io.first[0].gets.strip
-            handle_signal(signal)
+          # Poll for items on startup, and every :poll_delay
+          poll_tables
+          @timers.every(Shoryuken::Later.poll_delay){ poll_tables }
+          
+          # Loop watching for signals and firing off of timers
+          loop do
+            interval = @timers.wait_interval
+            readable, writable = IO.select([self_read], nil, nil, interval)
+            if readable
+              handle_signal readable.first.gets.strip
+            else
+              @timers.fire
+            end
           end
         rescue Interrupt
-          launcher.stop(shutdown: true)
+          @timers.cancel
           exit 0
         end
       end
+      
+      protected
+      
+      def poll_tables
+        logger.debug "Polling schedule tables"
+        @pollers.each do |poller|
+          poller.poll
+        end
+        logger.debug "Polling done"
+      end
 
       private
 
-      def load_celluloid
-        raise "Celluloid cannot be required until here, or it will break Shoryuken::Later's daemonization" if defined?(::Celluloid) && Shoryuken::Later.options[:daemon]
-
-        # Celluloid can't be loaded until after we've daemonized
-        # because it spins up threads and creates locks which get
-        # into a very bad state if forked.
-        require 'celluloid/autostart'
-        Celluloid.logger = (Shoryuken::Later.options[:verbose] ? Shoryuken::Later.logger : nil)
-
-        require 'shoryuken/later/manager'
-      end
-
       def load_rails
         # Adapted from: https://github.com/mperham/sidekiq/blob/master/lib/sidekiq/cli.rb
 
@@ -182,28 +190,11 @@ module Shoryuken
         case sig
         when 'USR1'
           logger.info "Received USR1, will soft shutdown down"
-
-          launcher.stop
-
+          @timers.cancel
+          sleep 1 while @busy
           exit 0
-        when 'TTIN'
-          Thread.list.each do |thread|
-            logger.info "Thread TID-#{thread.object_id.to_s(36)} #{thread['label']}"
-            if thread.backtrace
-              logger.info thread.backtrace.join("\n")
-            else
-              logger.info "<no backtrace available>"
-            end
-          end
-          
-          idle   = launcher.manager.instance_variable_get(:@idle).size
-          busy   = launcher.manager.instance_variable_get(:@busy).size
-          tables = launcher.manager.instance_variable_get(:@tables)
-
-          logger.info "Idle: #{idle}, Busy: #{busy}, Polled Tables: #{tables.join(', ')}"
         else
           logger.info "Received #{sig}, will shutdown down"
-
           raise Interrupt
         end
       end

data/lib/shoryuken/later/poller.rb

@@ -3,16 +3,12 @@ require 'json'
 module Shoryuken
   module Later
     class Poller
-      include Celluloid
       include Shoryuken::Util
       
       attr_reader :table_name
       
-      def initialize(manager, table_name)
-        @manager = manager
+      def initialize(table_name)
         @table_name = table_name
-        
-        @manager.async.poller_ready(@table_name, self)
       end
       
       def poll
@@ -25,12 +21,10 @@ module Shoryuken
             while item = next_item
               id = item.attributes['id']
               logger.info "Found message #{id} from '#{@table_name}'"
-              defer do
-                if sent_msg = process_item(item)
-                  logger.debug { "Enqueued message #{id} from '#{@table_name}' as #{sent_msg.id}" }
-                else
-                  logger.debug { "Skipping already queued message #{id} from '#{@table_name}'" }
-                end
+              if sent_msg = process_item(item)
+                logger.debug { "Enqueued message #{id} from '#{@table_name}' as #{sent_msg.id}" }
+              else
+                logger.debug { "Skipping already queued message #{id} from '#{@table_name}'" }
               end
             end
   
@@ -39,8 +33,6 @@ module Shoryuken
             logger.error "Error fetching message: #{ex}"
             logger.error ex.backtrace.first
           end
-            
-          @manager.async.poller_done(@table_name, self)
         end
       end
 

data/lib/shoryuken/later/version.rb

@@ -1,5 +1,5 @@
 module Shoryuken
   module Later
-    VERSION = '0.0.5.4'
+    VERSION = '0.0.6'
   end
-end
+end

data/shoryuken-later.gemspec

@@ -28,6 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry-byebug"
 
   spec.add_dependency "aws-sdk-v1"
-  spec.add_dependency "celluloid", "~> 0.16.0"
+  spec.add_dependency "timers", "~> 4.0.1"
   spec.add_dependency "shoryuken", "~> 0.0.5"
 end

data/spec/shoryuken/later/poller_spec.rb

@@ -1,9 +1,7 @@
 require 'spec_helper'
 require 'shoryuken/later/poller'
-require 'shoryuken/later/manager'
 
 describe Shoryuken::Later::Poller do
-  let(:manager)   { double Shoryuken::Later::Manager, poller_ready: nil, poller_done: nil }
   let(:ddb_table) { double 'DynamoDb Table' }
   let(:ddb_items) { double 'Table Items' }
   let(:table)     { 'shoryuken_later' }
@@ -17,38 +15,26 @@ describe Shoryuken::Later::Poller do
   end
 
   before do
-    allow(manager).to receive(:async).and_return(manager)
     allow(Shoryuken::Later::Client).to receive(:tables).with(table).and_return(ddb_table)
   end
 
   subject do
-    described_class.new(manager, table)
+    described_class.new(table)
   end
   
-  describe '#initialize' do
-    it 'informs the manager that the poller is ready' do
-      expect(manager).to receive(:poller_ready).once
-      
-      subject.inspect
-      subject.inspect
-    end
-  end
-
   describe '#poll' do
     it 'pulls items from #next_item, and processes with #process_item' do
       items = [ddb_item]
       expect_any_instance_of(described_class).to receive(:next_item).twice { items.pop }
       expect_any_instance_of(described_class).to receive(:process_item).once.with(ddb_item)
-      expect(manager).to receive(:poller_done).once
 
       subject.poll
     end
     
-    it 'informs the manager after polling is done' do
+    it 'does not call #process_item when there are no items' do
       items = []
       expect_any_instance_of(described_class).to receive(:next_item).once { items.pop }
       expect_any_instance_of(described_class).not_to receive(:process_item)
-      expect(manager).to receive(:poller_done).once
 
       subject.poll
     end

data/spec/spec_helper.rb

@@ -1,7 +1,6 @@
 require 'bundler/setup'
 Bundler.setup
 
-require 'celluloid'
 require 'shoryuken-later'
 require 'json'
 
@@ -16,7 +15,6 @@ if File.exists? options_file
 end
 
 Shoryuken.logger.level = Logger::UNKNOWN
-Celluloid.logger.level = Logger::UNKNOWN
 
 # For Ruby 1.9
 module Kernel

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoryuken-later
 version: !ruby/object:Gem::Version
-  version: 0.0.5.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Joe Khoobyar
@@ -87,19 +87,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: celluloid
+  name: timers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 4.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 4.0.1
 - !ruby/object:Gem::Dependency
   name: shoryuken
   requirement: !ruby/object:Gem::Requirement
@@ -134,8 +134,6 @@ files:
 - lib/shoryuken/later/active_job_adapter.rb
 - lib/shoryuken/later/cli.rb
 - lib/shoryuken/later/client.rb
-- lib/shoryuken/later/launcher.rb
-- lib/shoryuken/later/manager.rb
 - lib/shoryuken/later/poller.rb
 - lib/shoryuken/later/version.rb
 - lib/shoryuken/later/worker.rb

data/lib/shoryuken/later/launcher.rb

@@ -1,44 +0,0 @@
-# All of this has been "borrowed" from Shoryuken.
-
-# @see Shoryuken::Launcher
-module Shoryuken
-  module Later
-    class Launcher
-      include Celluloid
-      include Shoryuken::Util
-
-      trap_exit :actor_died
-
-      attr_accessor :manager
-      
-      def initialize
-        @condvar = Celluloid::Condition.new
-        @manager = Shoryuken::Later::Manager.new_link(@condvar)
-
-        @done = false
-      end
-
-      def stop(options = {})
-        watchdog('Later::Launcher#stop') do
-          @done = true
-
-          manager.async.stop(shutdown: !!options[:shutdown], timeout: Shoryuken::Later.options[:timeout])
-          @condvar.wait
-          manager.terminate
-        end
-      end
-
-      def run
-        watchdog('Later::Launcher#run') do
-          manager.async.start
-        end
-      end
-
-      def actor_died(actor, reason)
-        return if @done
-        logger.warn 'Shoryuken::Later died due to the following error, cannot recover, process exiting'
-        exit 1
-      end
-    end
-  end
-end

data/lib/shoryuken/later/manager.rb

@@ -1,139 +0,0 @@
-# Most of this has been "borrowed" from Shoryuken, but then repurposed for periodic polling.
-
-# @see Shoryuken::Manager
-require 'set'
-require 'shoryuken/later/poller'
-
-module Shoryuken
-  module Later
-    class Manager
-      include Celluloid
-      include Shoryuken::Util
-      
-      def initialize(condvar)
-        @tables = Shoryuken::Later.tables.dup.uniq
-        @finished = condvar
-        
-        @done = false
-        
-        @idle = Set.new([])
-        @busy = Set.new([])
-        @timers = {}
-        
-        @tables.each{|table| Poller.supervise_as :"poller-#{table}", current_actor, table }
-      end
-
-      def start
-        logger.info 'Starting'
-
-        # Start a poller for every table being polled.
-        @tables.each do |table|
-          dispatch table
-          
-          # Save the timer so it can be cancelled at shutdown.
-          @timers[table] = every(Shoryuken::Later.poll_delay) { dispatch table }
-        end
-      end
-
-      def stop(options = {})
-        watchdog('Later::Manager#stop died') do
-          @done = true
-          
-          @timers.each_value{|timer| timer.cancel if timer }
-          @timers.clear
-
-          logger.info { "Shutting down #{@idle.size} idle poller(s)" }
-
-          @idle.each do |name|
-            poller = Actor[name] and poller.alive? and poller.terminate
-          end
-          @idle.clear
-
-          if @busy.empty?
-            return after(0) { @finished.signal }
-          end
-
-          if options[:shutdown]
-            hard_shutdown_in(options[:timeout])
-          else
-            soft_shutdown(options[:timeout])
-          end
-        end
-      end
-
-      def poller_done(table, poller)
-        watchdog('Later::Manager#poller_done died') do
-          logger.debug { "Poller done for '#{table}'" }
-
-          name = :"poller-#{table}"
-          @busy.delete name
-
-          if stopped?
-            poller.terminate if poller.alive?
-          else
-            @idle << name
-          end
-        end
-      end
-
-      def poller_ready(table, poller)
-        watchdog('Later::Manager#poller_ready died') do
-          logger.debug { "Poller for '#{table}' ready" }
-
-          name = :"poller-#{table}"
-          @busy.delete name
-          @idle << name
-        end
-      end
-
-      def stopped?
-        @done
-      end
-
-      private
-      
-      def dispatch(table)
-        name = :"poller-#{table}"
-        
-        # Only start polling if the poller is idle.
-        if ! stopped? && @idle.include?(name)
-          @idle.delete(name)
-          @busy << name
-              
-          Actor[name].async.poll
-        end
-      end
-      
-      def soft_shutdown(delay)
-        logger.info { "Waiting for #{@busy.size} busy pollers" }
-
-        if @busy.size > 0
-          after(delay) { soft_shutdown(delay) }
-        else
-          @finished.signal
-        end
-      end
-
-      def hard_shutdown_in(delay)
-        logger.info { "Waiting for #{@busy.size} busy pollers" }
-        logger.info { "Pausing up to #{delay} seconds to allow pollers to finish..." }
-
-        after(delay) do
-          watchdog("Later::Manager#hard_shutdown_in died") do
-            if @busy.size > 0
-              logger.info { "Hard shutting down #{@busy.size} busy pollers" }
-
-              @busy.each do |busy|
-                if poller = Actor[busy]
-                  t = poller.bare_object.actual_work_thread
-                  t.raise Shutdown if poller.alive?
-                end
-              end
-            end
-            @finished.signal
-          end
-        end
-      end
-    end
-  end
-end