From: Tom Hughes <tom@compton.nu>
Date: Sat, 3 Nov 2018 11:57:25 +0000 (+0000)
Subject: Only use DelayedJob in production
X-Git-Tag: live~2786
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/422afdbae3129f6ba37e3b9860fd02bd97f4dedc?ds=sidebyside

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 a5431f09f..5139111cc 100644
--- 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 430032143..9e15487ae 100644
--- 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