trinidad_threaded_resque_extension 0.0.1 → 0.0.2

data/lib/trinidad_threaded_resque_extension/lifecycle_listener.rb

@@ -0,0 +1,55 @@
+module Trinidad
+  module Extensions
+    module ThreadedResque
+      class LifecycleListener
+        include Trinidad::Tomcat::LifecycleListener
+        attr_accessor :options, :workers, :threads
+
+        def initialize(options = {})
+          @options = options
+          require @options[:setup] if @options[:setup]
+        end
+
+        def lifecycleEvent(event)
+          case event.type
+          when Trinidad::Tomcat::Lifecycle::BEFORE_START_EVENT
+            start_workers
+          when Trinidad::Tomcat::Lifecycle::BEFORE_STOP_EVENT
+            stop_workers
+          end
+        end
+
+        def start_workers
+          @workers = create_workers
+          @threads = create_threads
+        end
+
+        def stop_workers
+          @workers.each { |w| w.shutdown }
+          @threads.each { |t| t.join }
+        end
+
+        private 
+        def create_workers
+          queues = @options[:queues] || { :all => 1 }
+          queues.map do |queue, count|
+            queue = '*' if queue.to_s == 'all'
+            count.to_i.times.map do 
+              worker = Resque::Worker.new(queue)
+              worker.cant_fork = true # fork is a noop in jruby
+              worker
+            end
+          end.flatten
+        end
+
+        def create_threads
+          @workers.map do |w|
+            Thread.new do
+              w.work
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/trinidad_threaded_resque_extension/resque_disable_signal_handlers.rb

@@ -6,5 +6,9 @@ module Resque
     alias :old_register_signal_handlers :register_signal_handlers
     def register_signal_handlers
     end
+
+    def to_s
+      @to_s ||= "#{hostname}:#{Process.pid}-#{Thread.current.object_id}:#{@queues.join(',')}"
+    end
   end
 end

data/lib/trinidad_threaded_resque_extension/version.rb

@@ -1,3 +1,3 @@
 module TrinidadThreadedResqueExtension
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/trinidad_threaded_resque_extension.rb

@@ -1,45 +1,14 @@
 require 'resque'
 require 'trinidad'
 require_relative "trinidad_threaded_resque_extension/version"
+require_relative "trinidad_threaded_resque_extension/lifecycle_listener"
 require_relative "trinidad_threaded_resque_extension/resque_disable_signal_handlers"
 
 module Trinidad
   module Extensions
-    module ThreadedResque
-      class ThreadedResqueLifecycleListener
-        include Trinidad::Tomcat::LifecycleListener
-        def initialize(options = {})
-          @options = options
-          require @options[:setup] if @options[:setup]
-        end
-
-        def lifecycleEvent(event)
-          case event.type
-          when Trinidad::Tomcat::Lifecycle::BEFORE_START_EVENT
-            start_workers
-          when Trinidad::Tomcat::Lifecycle::BEFORE_STOP_EVENT
-            stop_workers
-          end
-        end
-
-        def start_workers
-          queues = @options[:queues] || { 'all' => 1 }
-          @workers = queues.map do |queue, count|
-            queue = '*' if queue == 'all'
-            count.to_i.times.map do 
-              worker = Resque::Worker.new(queue)
-              worker.cant_fork = true # fork is a noop in jruby
-              Thread.new do
-                worker.work
-              end
-              worker
-            end
-          end.flatten
-        end
-
-        def stop_workers
-          @workers.each { |w| w.shutdown! }
-        end
+    class ThreadedResqueServerExtension < ServerExtension
+      def configure(tomcat)
+        tomcat.host.add_lifecycle_listener(ThreadedResque::LifecycleListener.new(@options))
       end
     end
   end

data/spec/resque_extension_spec.rb

@@ -1,35 +1,34 @@
 require './lib/trinidad_threaded_resque_extension'
 Resque.inline = true
 
-describe Trinidad::Extensions::ThreadedResque::ThreadedResqueLifecycleListener do
-  subject { Trinidad::Extensions::ThreadedResque::ThreadedResqueLifecycleListener.new }
-
+describe Trinidad::Extensions::ThreadedResque::LifecycleListener do
   it 'starts by default one worker' do
-    workers = subject.start_workers
-    workers.should have(1).things
+    subject.start_workers
+    subject.workers.should have(1).things
   end
 
   it 'can start many workers' do
-    subject.instance_variable_set(:@options, {:queues => {"q1" => 2 }})
-    workers = subject.start_workers
-    workers.should have(2).things
-    workers[0].queues.should == ['q1']
-    workers[1].queues.should == ['q1']
+    subject.options = { :queues => { "q1" => 2 } }
+    subject.start_workers
+    subject.workers.map{ |w| w.queues }.flatten.count('q1').should == 2
   end
 
   it 'can start many workers for different queues' do
-    subject.instance_variable_set(:@options, {:queues => {"q1" => 2, "q2" => 2 }})
-    workers = subject.start_workers
-    workers.should have(4).things
-    workers[0].queues.should == ['q1']
-    workers[1].queues.should == ['q1']
-    workers[2].queues.should == ['q2']
-    workers[3].queues.should == ['q2']
+    subject.options = { :queues => {"q1" => 2, "q2" => 2 } }
+    subject.start_workers
+    queues = subject.workers.map{ |w| w.queues }.flatten
+    queues.count('q1').should == 2
+    queues.count('q2').should == 2
   end
 
   it 'can shutdown workers' do
     subject.start_workers
-    workers = subject.stop_workers
-    workers[0].shutdown?.should == true
+    subject.stop_workers
+    subject.workers[0].shutdown?.should == true
+    subject.threads[0].stop?.should == true
+  end
+  
+  after do
+    subject.stop_workers
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: trinidad_threaded_resque_extension
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Carl Hörberg
@@ -79,6 +79,7 @@ files:
 - README.md
 - Rakefile
 - lib/trinidad_threaded_resque_extension.rb
+- lib/trinidad_threaded_resque_extension/lifecycle_listener.rb
 - lib/trinidad_threaded_resque_extension/resque_disable_signal_handlers.rb
 - lib/trinidad_threaded_resque_extension/version.rb
 - spec/resque_extension_spec.rb