que 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c7ef330bef62b6f1407608630ada0a4522e3d36
-  data.tar.gz: d7e98fbbc652b8299c21be083a464ab263bbdf40
+  metadata.gz: 8029277244c5b5f8e4d838c9e16b2ebddd402919
+  data.tar.gz: 06fe39d7feb085098468d4b7f019aa0a40433016
 SHA512:
-  metadata.gz: a85590d23bc40818ba9bbe1fdd37cecb10d580f864b841aa1382be3ee9bbb200d7732379c0c604e61d6bfbb9384599a6f5e24f1123ef6acd00ca659a8ca67c1b
-  data.tar.gz: 30967fd239d28158742e143520c23e1f00e061bf709157efd7b1654e3ba4bbc2d8a9af475127aa63e865b9772365ac1b3ea056a6b52414607e2115fb0b944871
+  metadata.gz: 3564b06d93c6001367f7d728e6ba22600abe53609a6551bc73aac2dda6cd6ab55629e12b002adb9998981960358617f8b0fd045d5ee9367ef52e1fd371dfb654
+  data.tar.gz: 2f7731e0b01ffed874937273c86364f7a19bd6de67a573f8c82aedf1dcc5918e6c841ae1b78dbbd90c085f9f5112c5440551f72f4738081ec9c24a1b8f49aae7

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 0.8.2 (2014-10-12)
+
+*   Fix errors raised during rollbacks in the ActiveRecord adapter, which remained silent until Rails 4.2. (#64, #65) (Strech)
+
 ### 0.8.1 (2014-07-28)
 
 *   Fix regression introduced in the `que:work` rake task by the `mode` / `worker_count` disentangling in 0.8.0. (#50)

data/docs/advanced_setup.md

@@ -20,7 +20,7 @@ There are other docs to read if you're using [Sequel](https://github.com/chanks/
 
 ### Forking Servers
 
-If you want to run a worker pool in your web process and you're using a forking webserver like Unicorn or Puma in some configurations, you'll want to set `Que.mode = :off` in your application configuration and only start up the worker pool in the child processes after the DB connection has been reestablished. So, for Puma:
+If you want to run a worker pool in your web process and you're using a forking webserver like Phusion Passenger (in smart spawning mode), Unicorn or Puma in some configurations, you'll want to set `Que.mode = :off` in your application configuration and only start up the worker pool in the child processes after the DB connection has been reestablished. So, for Puma:
 
     # config/puma.rb
     on_worker_boot do
@@ -38,6 +38,17 @@ And for Unicorn:
       Que.mode = :async
     end
 
+And for Phusion Passenger:
+
+    # config.ru
+    if defined?(PhusionPassenger)
+      PhusionPassenger.on_event(:starting_worker_process) do |forked|
+        if forked
+          Que.mode = :async
+        end
+      end
+    end
+
 
 ### Managing the Jobs Table
 

data/lib/que/adapters/active_record.rb

@@ -8,18 +8,22 @@ module Que
       def wake_worker_after_commit
         # Works with ActiveRecord 3.2 and 4 (possibly earlier, didn't check)
         if in_transaction?
-          checkout_activerecord_adapter { |adapter| adapter.add_transaction_record(CommittedCallback.new) }
+          checkout_activerecord_adapter { |adapter| adapter.add_transaction_record(TransactionCallback.new) }
         else
           Que.wake!
         end
       end
 
-      class CommittedCallback
+      class TransactionCallback
         def has_transactional_callbacks?
           true
         end
 
-        def committed!
+        def rolledback!(force_restore_state = false, should_run_callbacks = true)
+          # no-op
+        end
+
+        def committed!(should_run_callbacks = true)
           Que.wake!
         end
       end

data/lib/que/job.rb

@@ -12,7 +12,7 @@ module Que
     end
 
     def _run
-      run *attrs[:args]
+      run(*attrs[:args])
       destroy unless @destroyed
     end
 

data/lib/que/version.rb

@@ -1,3 +1,3 @@
 module Que
-  Version = '0.8.1'
+  Version = '0.8.2'
 end

data/lib/que/worker.rb

@@ -151,18 +151,18 @@ module Que
       end
 
       def wake!
-        workers.find &:wake!
+        workers.find(&:wake!)
       end
 
       def wake_all!
-        workers.each &:wake!
+        workers.each(&:wake!)
       end
 
       private
 
       def set_up_workers
         if worker_count > workers.count
-          workers.push *(worker_count - workers.count).times.map{new(ENV['QUE_QUEUE'] || '')}
+          workers.push(*(worker_count - workers.count).times.map{new(ENV['QUE_QUEUE'] || '')})
         elsif worker_count < workers.count
           workers.pop(workers.count - worker_count).each(&:stop).each(&:wait_until_stopped)
         end
@@ -171,7 +171,7 @@ module Que
       def wrangler
         @wrangler ||= Thread.new do
           loop do
-            sleep *@wake_interval
+            sleep(*@wake_interval)
             wake! if @wake_interval && mode == :async
           end
         end

data/lib/que.rb

@@ -32,8 +32,8 @@ module Que
           when 'Pond'                       then Adapters::Pond.new(connection)
           when 'NilClass'                   then connection
           else raise "Que connection not recognized: #{connection.inspect}"
+          end
         end
-      end
     end
 
     def adapter

data/spec/adapters/active_record_spec.rb

@@ -4,7 +4,11 @@ unless defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
   require 'spec_helper'
   require 'active_record'
 
+  if ActiveRecord.version.release >= Gem::Version.new('4.2')
+    ActiveRecord::Base.raise_in_transactional_callbacks = true
+  end
   ActiveRecord::Base.establish_connection(QUE_URL)
+
   Que.connection = ActiveRecord
   QUE_ADAPTERS[:active_record] = Que.adapter
 
@@ -101,6 +105,14 @@ unless defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
       Que::Worker.workers.each { |worker| worker.should be_sleeping }
     end
 
+    it "should be able to survive an ActiveRecord::Rollback without raising an error" do
+      ActiveRecord::Base.transaction do
+        Que::Job.enqueue
+        raise ActiveRecord::Rollback, "Call tech support!"
+      end
+      DB[:que_jobs].count.should be 0
+    end
+
     it "should be able to tell when it's in an ActiveRecord transaction" do
       Que.adapter.should_not be_in_transaction
       ActiveRecord::Base.transaction do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: que
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Chris Hanks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2014-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler