Merge branch 'master' into session

* master: (55 commits)
  extract deprecated dynamic methods
  Add some docs and changelog entry
  Allow overriding exception handling in threaded consumer
  Allow configuring a different queue consumer
  actually don't need to expand the aggregates at all
  #to_sym is unnecessary
  de-globalise method
  extract code from AR::Base
  clean up implementation of dynamic methods. use method compilation etc.
  Fix ActiveModel README example
  mention database mapping in getting started guide
  Remove vestiges of the http_only! config from configuring guide
  Remove content-length as well
  Make ActionController#head pass rack-link
  RouteSet: optimize routes generation when globbing is used
  Allows assert_redirected_to to accept a regular expression
  use extract_options!
  No need to force conversion to Symbol since case ensures it's already one.
  No need to work around 1.8 warnings anymore.
  Update command line guide
  ...

1 files changed, 7 insertions, 3 deletions

diff --git a/railties/lib/rails/queueing.rb b/railties/lib/rails/queueing.rb
index 2e187b8555..b4bc7fcd18 100644
--- a/railties/lib/rails/queueing.rb
+++ b/railties/lib/rails/queueing.rb
@@ -16,13 +16,13 @@ module Rails
     # Jobs are run in a separate thread to catch mistakes where code
     # assumes that the job is run in the same thread.
     class TestQueue < ::Queue
-      # Get a list of the jobs off this queue.  This method may not be
+      # Get a list of the jobs off this queue. This method may not be
       # available on production queues.
       def jobs
         @que.dup
       end
 
-      # Drain the queue, running all jobs in a different thread.  This method
+      # Drain the queue, running all jobs in a different thread. This method
       # may not be available on production queues.
       def drain
         # run the jobs in a separate thread so assumptions of synchronous
@@ -53,7 +53,7 @@ module Rails
             begin
               job.run
             rescue Exception => e
-              Rails.logger.error "Job Error: #{e.message}\n#{e.backtrace.join("\n")}"
+              handle_exception e
             end
           end
         end
@@ -64,6 +64,10 @@ module Rails
         @queue.push nil
         @thread.join
       end
+
+      def handle_exception(e)
+        Rails.logger.error "Job Error: #{e.message}\n#{e.backtrace.join("\n")}"
+      end
     end
   end
 end