Skip to content

Commit

Permalink
Move backend setup into config.after_initialize
Browse files Browse the repository at this point in the history
  • Loading branch information
bkeepers committed Mar 26, 2010
1 parent 59c1544 commit 0a4ffb4
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 10 deletions.
1 change: 0 additions & 1 deletion init.rb

This file was deleted.

9 changes: 0 additions & 9 deletions lib/delayed_job.rb
Expand Up @@ -8,15 +8,6 @@
Object.send(:include, Delayed::MessageSending)
Module.send(:include, Delayed::MessageSending::ClassMethods)

if defined?(ActiveRecord)
Delayed::Worker.backend = :active_record
elsif defined?(MongoMapper)
Delayed::Worker.backend = :mongo_mapper
else
$stderr.puts "Could not decide on a backend, defaulting to active_record"
Delayed::Worker.backend = :active_record
end

if defined?(Merb::Plugins)
Merb::Plugins.add_rakefiles File.dirname(__FILE__) / 'delayed' / 'tasks'
end
12 changes: 12 additions & 0 deletions rails/init.rb
@@ -0,0 +1,12 @@
require 'delayed_job'

config.after_initialize do
Delayed::Worker.backend ||= if defined?(ActiveRecord)
:active_record
elsif defined?(MongoMapper)
:mongo_mapper
else
Delayed::Worker.logger.warn "Could not decide on a backend, defaulting to active_record"
:active_record
end
end
2 changes: 2 additions & 0 deletions spec/spec_helper.rb
Expand Up @@ -27,6 +27,8 @@

DEFAULT_BACKEND = backends_available.first.to_sym

Delayed::Worker.backend = DEFAULT_BACKEND

backends_available.each do |backend|
require "setup/#{backend}"
require "backend/#{backend}_job_spec"
Expand Down

0 comments on commit 0a4ffb4

Please sign in to comment.