trinidad_threaded_resque_extension 0.0.2 → 0.1.0

data/README.md

@@ -18,17 +18,17 @@ Then configure it via config/trinidad.rb:
 
     require 'bundler/setup'
     Trinidad.configure |config|
+      config.jruby_max_runtimes = 1
       ...
       config.extensions = {
-        threaded_resque = {
-          setup: './config/setup_resque_workers', # will be required before starting the workers
+        threaded_resque: {
+          require: './config/setup_resque_workers', # will be required before starting the workers, setup Resque and require the jobs here
           queues: {
-            # syntax: "queue name: number of workers"
-            # the "all" queue is an alias for "*"
-            # default is "all: 1"
-            all: 3,
-            high: 2,
-            low: 1
+            # hash key is queue name
+            # hash value is the number of workers consuming that queue
+            # default: '*' => 1
+            io_bound: 20,
+            cpu_bound: 3,
           }
         }
       }
@@ -37,7 +37,7 @@ Then configure it via config/trinidad.rb:
 
 Start trinidad and enjoy the low memory usage while having high concurrency.
 
-Note that becasue JRuby can't fork you want to have well behaved workers, watch out for memory leakage.. 
+Note that becasue JRuby can't fork you want to have well behaved workers, watch out for memory leakage. Naturally your workers have to be thread safe.
 
 ## Contributing
 
@@ -46,3 +46,4 @@ Note that becasue JRuby can't fork you want to have well behaved workers, watch
 3. Commit your changes (`git commit -am 'Added some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+

data/lib/trinidad_threaded_resque_extension.rb

@@ -2,7 +2,6 @@ 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

data/lib/trinidad_threaded_resque_extension/lifecycle_listener.rb

@@ -1,3 +1,5 @@
+require_relative "worker"
+
 module Trinidad
   module Extensions
     module ThreadedResque
@@ -7,7 +9,6 @@ module Trinidad
 
         def initialize(options = {})
           @options = options
-          require @options[:setup] if @options[:setup]
         end
 
         def lifecycleEvent(event)
@@ -20,24 +21,30 @@ module Trinidad
         end
 
         def start_workers
+          pre_require
           @workers = create_workers
           @threads = create_threads
         end
 
         def stop_workers
-          @workers.each { |w| w.shutdown }
-          @threads.each { |t| t.join }
+          @workers.each { |w| w.shutdown } if @workers
+          @threads.each { |t| t.join } if @threads
         end
 
         private 
+        def pre_require
+          if @options[:require]
+            require @options[:require] 
+          else
+            raise "You probably want to require something before starting the workers"
+          end
+        end
+
         def create_workers
-          queues = @options[:queues] || { :all => 1 }
+          queues = @options[:queues] || { '*' => 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
+              ThreadedResque::Worker.new(queue.to_s)
             end
           end.flatten
         end

data/lib/trinidad_threaded_resque_extension/version.rb

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

data/lib/trinidad_threaded_resque_extension/worker.rb

@@ -0,0 +1,23 @@
+require 'resque'
+
+module Trinidad
+  module Extensions
+    module ThreadedResque
+      class Worker < Resque::Worker
+        def initialize(*queues)
+          super(*queues)
+          @cant_fork = true
+        end
+
+        # we can't let resque trap signal
+        def register_signal_handlers
+        end
+
+        #override to_s and separate different workers by there thread id
+        def to_s
+          @to_s ||= "#{hostname}:#{Process.pid}-#{Thread.current.object_id}:#{@queues.join(',')}"
+        end
+      end
+    end
+  end
+end

data/spec/dummy.rb

@@ -0,0 +1,2 @@
+module Dummy
+end

data/spec/resque_extension_spec.rb

@@ -1,34 +1,58 @@
 require './lib/trinidad_threaded_resque_extension'
-Resque.inline = true
 
 describe Trinidad::Extensions::ThreadedResque::LifecycleListener do
-  it 'starts by default one worker' do
-    subject.start_workers
-    subject.workers.should have(1).things
-  end
+  let(:opts) { { :require => './spec/dummy' } }
+  subject { Trinidad::Extensions::ThreadedResque::LifecycleListener.new opts }
 
-  it 'can start many workers' do
-    subject.options = { :queues => { "q1" => 2 } }
-    subject.start_workers
-    subject.workers.map{ |w| w.queues }.flatten.count('q1').should == 2
-  end
+  context '#start_workers' do
+    it 'starts by default one worker' do
+      subject.start_workers
+      subject.workers.should have(1).things
+    end
 
-  it 'can start many workers for different queues' do
-    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 start many workers' do
+      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.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 'requires the "require" file' do
+      subject.start_workers
+      defined?(Dummy).should_not be_nil
+    end
 
-  it 'can shutdown workers' do
-    subject.start_workers
-    subject.stop_workers
-    subject.workers[0].shutdown?.should == true
-    subject.threads[0].stop?.should == true
+    it 'raises if no "require" file is configured' do
+      subject.options[:require] = nil
+      lambda {
+        subject.start_workers
+      }.should raise_error RuntimeError
+    end
+
+    after do
+      subject.stop_workers
+    end
   end
-  
-  after do
-    subject.stop_workers
+
+  context '#stop_workers' do
+    before do
+      subject.start_workers
+      subject.stop_workers
+    end
+
+    it 'shutdowns workers' do
+      subject.workers[0].shutdown?.should be_true
+    end
+
+    it 'stops threads' do
+      subject.threads[0].stop?.should be_true
+    end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: trinidad_threaded_resque_extension
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Carl Hörberg
@@ -80,8 +80,9 @@ files:
 - 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
+- lib/trinidad_threaded_resque_extension/worker.rb
+- spec/dummy.rb
 - spec/resque_extension_spec.rb
 - trinidad_threaded_resque_extension.gemspec
 homepage: https://github.com/carlhoerberg/trinidad_threaded_resque_extension
@@ -109,5 +110,6 @@ signing_key:
 specification_version: 3
 summary: Runs Resque workers, threaded, within the Trinidad application server
 test_files:
+- spec/dummy.rb
 - spec/resque_extension_spec.rb
 ...

data/lib/trinidad_threaded_resque_extension/resque_disable_signal_handlers.rb

@@ -1,14 +0,0 @@
-require 'resque'
-
-module Resque
-  class Worker
-    # if we let resque trap signals trinidad cannot ever be stopped
-    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