diff options
| author | ThibG <thib@sitedethib.com> | 2018-11-09 22:29:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-09 22:29:52 +0100 |
| commit | 09562b0fcc193d66f89a9f2c7eb2684e2e554d83 (patch) | |
| tree | 87747f5dda99de033d15ec1319a7c188fa0df750 /config/puma.rb | |
| parent | 868cace7975532509c41800c7b6b9a6c7838a6b0 (diff) | |
| parent | c6fc3e0c65a0ae78e76ebb5da1a12a23727b72c8 (diff) | |
Merge pull request #806 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/puma.rb')
| -rw-r--r-- | config/puma.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config/puma.rb b/config/puma.rb index 5ebf5ed19..1afdb1c6d 100644 --- a/config/puma.rb +++ b/config/puma.rb @@ -13,7 +13,9 @@ workers ENV.fetch('WEB_CONCURRENCY') { 2 } preload_app! on_worker_boot do - ActiveRecord::Base.establish_connection if defined?(ActiveRecord) + ActiveSupport.on_load(:active_record) do + ActiveRecord::Base.establish_connection + end end plugin :tmp_restart |