Merge pull request #172 from p8/fix/autoload

Fix Rails autoloading
collectiveidea · Nov 8, 2019 · 31fe97c · 31fe97c
2 parents ceb5b07 + 573dd72
commit 31fe97c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/lib/delayed/backend/active_record/railtie.rb b/lib/delayed/backend/active_record/railtie.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Delayed
+  module Backend
+    module ActiveRecord
+      class Railtie < ::Rails::Railtie
+        config.after_initialize do
+          require "delayed/backend/active_record"
+          Delayed::Worker.backend = :active_record
+        end
+      end
+    end
+  end
+end
diff --git a/lib/delayed_job_active_record.rb b/lib/delayed_job_active_record.rb
@@ -1,7 +1,12 @@
 # frozen_string_literal: true
 
-require "active_record"
 require "delayed_job"
-require "delayed/backend/active_record"
 
-Delayed::Worker.backend = :active_record
+if defined?(Rails::Railtie)
+  require "delayed/backend/active_record/railtie"
+else
+  require "active_record"
+  require "delayed/backend/active_record"
+
+  Delayed::Worker.backend = :active_record
+end