diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2019-04-09 15:24:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-09 15:24:08 -0400 |
| commit | d5f2deb1539927c8793588e7d1e86d84211d4da8 (patch) | |
| tree | 9eb9903254b425e502db518f1f8425ed6d8dd0b4 /railties/lib/rails | |
| parent | dd58d040b2b798105b95e21396e86266bfd40de9 (diff) | |
| parent | 75811c37a9c1cc7d6977cd841437d136d4b95440 (diff) | |
| download | rails-d5f2deb1539927c8793588e7d1e86d84211d4da8.tar.gz rails-d5f2deb1539927c8793588e7d1e86d84211d4da8.tar.bz2 rails-d5f2deb1539927c8793588e7d1e86d84211d4da8.zip | |
Merge pull request #35905 from BatedUrGonnaDie/dont-override-job-seed-adapter
Only override async adapter when seeding
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/engine.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb index 778bbebe75..eb2f0e8fca 100644 --- a/railties/lib/rails/engine.rb +++ b/railties/lib/rails/engine.rb @@ -550,7 +550,13 @@ module Rails # Blog::Engine.load_seed def load_seed seed_file = paths["db/seeds.rb"].existent.first - with_inline_jobs { load(seed_file) } if seed_file + return unless seed_file + + if config.active_job.queue_adapter == :async + with_inline_jobs { load(seed_file) } + else + load(seed_file) + end end # Add configured load paths to Ruby's load path, and remove duplicate entries. |