Commit 4b9f2bab authored by Stan Hu's avatar Stan Hu

Merge branch '49756-update-unicorn.rb.example.development' into 'master'

Resolve "Unicorn development settings should match production as much as possible"

Closes #49756

See merge request gitlab-org/gitlab-ce!20919
parents b901df22 e315dca6
...@@ -67,11 +67,11 @@ pid "/home/git/gitlab/tmp/pids/unicorn.pid" ...@@ -67,11 +67,11 @@ pid "/home/git/gitlab/tmp/pids/unicorn.pid"
stderr_path "/home/git/gitlab/log/unicorn.stderr.log" stderr_path "/home/git/gitlab/log/unicorn.stderr.log"
stdout_path "/home/git/gitlab/log/unicorn.stdout.log" stdout_path "/home/git/gitlab/log/unicorn.stdout.log"
# combine Ruby 2.0.0dev or REE with "preload_app true" for memory savings # Save memory by sharing the application code among multiple Unicorn workers
# http://rubyenterpriseedition.com/faq.html#adapt_apps_for_cow # with "preload_app true". See:
# https://www.rubydoc.info/gems/unicorn/5.1.0/Unicorn%2FConfigurator:preload_app
# https://brandur.org/ruby-memory#copy-on-write
preload_app true preload_app true
GC.respond_to?(:copy_on_write_friendly=) and
GC.copy_on_write_friendly = true
# Enable this flag to have unicorn test client connections by writing the # Enable this flag to have unicorn test client connections by writing the
# beginning of the HTTP headers before calling the application. This # beginning of the HTTP headers before calling the application. This
......
worker_processes 2 worker_processes 2
timeout 60 timeout 60
preload_app true
check_client_connection false
before_fork do |server, worker| 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
ActiveRecord::Base.connection.disconnect!
if /darwin/ =~ RUBY_PLATFORM if /darwin/ =~ RUBY_PLATFORM
require 'fiddle' require 'fiddle'
...@@ -13,3 +21,12 @@ before_fork do |server, worker| ...@@ -13,3 +21,12 @@ before_fork do |server, worker|
end end
end end
after_fork do |server, worker|
# Unicorn clears out signals before it forks, so rbtrace won't work
# unless it is enabled after the fork.
require 'rbtrace' if ENV['ENABLE_RBTRACE']
# the following is *required* for Rails + "preload_app true",
defined?(ActiveRecord::Base) and
ActiveRecord::Base.establish_connection
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment