diff options
| author | jerasmus <jerasmus@gitlab.com> | 2018-10-15 12:42:24 +0200 |
|---|---|---|
| committer | jerasmus <jerasmus@gitlab.com> | 2018-10-15 12:42:24 +0200 |
| commit | 58f29d5f855ea2e1411b99804a74710483a13f90 (patch) | |
| tree | 0b06ecd3c0bb1bcf3d3c6660c2bc49eefaff08b2 /config/unicorn.rb.example | |
| parent | 0572da24c990fc01d88acfbd32728221e3e3a711 (diff) | |
| parent | a9827357186e38e5732d8dae23d9d02b1f4c7218 (diff) | |
| download | gitlab-ce-58f29d5f855ea2e1411b99804a74710483a13f90.tar.gz | |
Merge branch 'master' into 48746-fix-files-uploaded-in-base6448746-fix-files-uploaded-in-base64
Diffstat (limited to 'config/unicorn.rb.example')
| -rw-r--r-- | config/unicorn.rb.example | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/unicorn.rb.example b/config/unicorn.rb.example index 020e9a00d87..e06cce3e97a 100644 --- a/config/unicorn.rb.example +++ b/config/unicorn.rb.example @@ -95,7 +95,7 @@ end before_fork do |server, worker| # the following is highly recommended for Rails + "preload_app true" # as there's no need for the master process to hold a connection - defined?(ActiveRecord::Base) and + defined?(ActiveRecord::Base) && ActiveRecord::Base.connection.disconnect! # The following is only recommended for memory/DB-constrained @@ -133,7 +133,7 @@ after_fork do |server, worker| # server.listen(addr, :tries => -1, :delay => 5, :tcp_nopush => true) # the following is *required* for Rails + "preload_app true", - defined?(ActiveRecord::Base) and + defined?(ActiveRecord::Base) && ActiveRecord::Base.establish_connection # reset prometheus client, this will cause any opened metrics files to be closed |