Only use DelayedJob in production

In development just let the default async adaptor be used so
that people don't need to run a daemon.

diff --git a/config/application.rb b/config/application.rb
index a5431f09f09bb94ea8eb32f46e0a2dfd1d02af00..5139111cc8460dce6bb65d296ff8b84b2c82c37e 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -51,8 +51,5 @@ module OpenStreetMap
       config.logstasher.logger_path = LOGSTASH_PATH
       config.logstasher.log_controller_parameters = true
     end
-
-    # Use DelayedJob as the persistent backend for ActiveJob
-    config.active_job.queue_adapter = :delayed_job
   end
 end

diff --git a/config/environments/production.rb b/config/environments/production.rb
index 4300321439f12f76ac040bf8b09b2c9886f534c0..9e15487ae4877fb80d9d1e0177958dbaee7efead 100644 (file)
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -99,4 +99,7 @@ Rails.application.configure do
 
   # Enable autoloading of dependencies.
   config.enable_dependency_loading = true
+
+  # Use delayed job to queue jobs in production.
+  config.active_job.queue_adapter = :delayed_job
 end