kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Dont need the explicit error handling -- if the require fails, it will raise exactly the error we want to communicate anyway. Also use the load path, so we can allow plugins, rather than requre_relative

Browse source
This commit is contained in:
David Heinemeier Hansson 2014-05-19 09:47:55 +02:00
parent d7c30987ff
commit fd1e61adfc
2 changed files with 2 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/active_job/base.rb
View file

@ -1,9 +1,7 @@
require 'active_job/errors'
require 'active_job/queue_adapters/inline_adapter'
require 'active_support/core_ext/string/inflections'
module ActiveJob
class Base
cattr_accessor(:queue_adapter) { ActiveJob::QueueAdapters::InlineAdapter }
cattr_accessor(:queue_base_name) { "active_jobs" }
@ -19,19 +17,9 @@ module ActiveJob
end
def adapter=(adapter_name)
adapter_name = adapter_name.to_s
unless %w(inline resque sidekiq sucker_punch).include?(adapter_name)
fail ActiveJob::NotImplementedError
end
begin
require_relative "queue_adapters/#{adapter_name}_adapter"
ActiveJob::Base.queue_adapter = "ActiveJob::QueueAdapters::#{adapter_name.camelize}Adapter".constantize
rescue
fail ActiveJob::Error.new("#{adapter_name} is missing")
end
require "active_job/queue_adapters/#{adapter_name}_adapter"
ActiveJob::Base.queue_adapter = "ActiveJob::QueueAdapters::#{adapter_name.to_s.camelize}Adapter".constantize
end
end
end
end

12
lib/active_job/errors.rb
View file

@ -1,12 +0,0 @@
module ActiveJob
class NotImplementedError < ::NotImplementedError #:nodoc:
end
class Error < ::StandardError #:nodoc:
def initialize(message = nil)
super(message)
end
end
end