Add puma.rb and use it from gitlab-puma.service
This commit is contained in:
Pirate Praveen
parent
c196da8e5f
commit
956a715cff
78
debian/conf/puma.rb
vendored
Normal file
78
debian/conf/puma.rb
vendored
Normal file
|
|
@ -0,0 +1,78 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
# Load "path" as a rackup file.
|
||||
#
|
||||
# The default is "config.ru".
|
||||
#
|
||||
rackup 'config.ru'
|
||||
pidfile "#{ENV['gitlab_pid_path']}/puma.pid"
|
||||
state_path "#{ENV['gitlab_pid_path']}/puma.state"
|
||||
|
||||
stdout_redirect File.join(ENV['gitlab_log_dir'],"puma.stdout.log"),
|
||||
File.join(ENV['gitlab_log_dir'],"puma.stderr.log"),
|
||||
true
|
||||
|
||||
# Configure "min" to be the minimum number of threads to use to answer
|
||||
# requests and "max" the maximum.
|
||||
#
|
||||
# The default is "0, 16".
|
||||
#
|
||||
threads 1, 16
|
||||
|
||||
# By default, workers accept all requests and queue them to pass to handlers.
|
||||
# When false, workers accept the number of simultaneous requests configured.
|
||||
#
|
||||
# Queueing requests generally improves performance, but can cause deadlocks if
|
||||
# the app is waiting on a request to itself. See https://github.com/puma/puma/issues/612
|
||||
#
|
||||
# When set to false this may require a reverse proxy to handle slow clients and
|
||||
# queue requests before they reach puma. This is due to disabling HTTP keepalive
|
||||
queue_requests false
|
||||
|
||||
# Bind the server to "url". "tcp://", "unix://" and "ssl://" are the only
|
||||
# accepted protocols.
|
||||
bind "unix://#{ENV['gitlab_pid_path']}/gitlab.socket"
|
||||
|
||||
workers 3
|
||||
|
||||
require_relative "#{ENV['gitlab_app_root']}/lib/gitlab/cluster/lifecycle_events"
|
||||
require_relative "#{ENV['gitlab_app_root']}/lib/gitlab/cluster/puma_worker_killer_initializer"
|
||||
|
||||
on_restart do
|
||||
# Signal application hooks that we're about to restart
|
||||
Gitlab::Cluster::LifecycleEvents.do_before_master_restart
|
||||
end
|
||||
|
||||
before_fork do
|
||||
# Signal to the puma killer
|
||||
Gitlab::Cluster::PumaWorkerKillerInitializer.start @config.options unless ENV['DISABLE_PUMA_WORKER_KILLER']
|
||||
|
||||
# Signal application hooks that we're about to fork
|
||||
Gitlab::Cluster::LifecycleEvents.do_before_fork
|
||||
end
|
||||
|
||||
Gitlab::Cluster::LifecycleEvents.set_puma_options @config.options
|
||||
on_worker_boot do
|
||||
# Signal application hooks of worker start
|
||||
Gitlab::Cluster::LifecycleEvents.do_worker_start
|
||||
end
|
||||
|
||||
# Preload the application before starting the workers; this conflicts with
|
||||
# phased restart feature. (off by default)
|
||||
preload_app!
|
||||
|
||||
tag 'gitlab-puma-worker'
|
||||
|
||||
# Verifies that all workers have checked in to the master process within
|
||||
# the given timeout. If not the worker process will be restarted. Default
|
||||
# value is 60 seconds.
|
||||
#
|
||||
worker_timeout 60
|
||||
|
||||
# Use json formatter
|
||||
require_relative "#{ENV['gitlab_app_root']}/lib/gitlab/puma_logging/json_formatter"
|
||||
|
||||
json_formatter = Gitlab::PumaLogging::JSONFormatter.new
|
||||
log_formatter do |str|
|
||||
json_formatter.call(str)
|
||||
end
|
||||
126
debian/conf/unicorn.rb
vendored
126
debian/conf/unicorn.rb
vendored
|
|
@ -1,126 +0,0 @@
|
|||
# Sample verbose configuration file for Unicorn (not Rack)
|
||||
#
|
||||
# This configuration file documents many features of Unicorn
|
||||
# that may not be needed for some applications. See
|
||||
# http://unicorn.bogomips.org/examples/unicorn.conf.minimal.rb
|
||||
# for a much simpler configuration file.
|
||||
#
|
||||
# See http://unicorn.bogomips.org/Unicorn/Configurator.html for complete
|
||||
# documentation.
|
||||
|
||||
# Note: If you change this file in a Merge Request, please also create a
|
||||
# Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
|
||||
#
|
||||
# WARNING: See config/application.rb under "Relative url support" for the list of
|
||||
# other files that need to be changed for relative url support
|
||||
#
|
||||
# ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"
|
||||
|
||||
# Read about unicorn workers here:
|
||||
# http://doc.gitlab.com/ee/install/requirements.html#unicorn-workers
|
||||
#
|
||||
worker_processes 3
|
||||
|
||||
# Since Unicorn is never exposed to outside clients, it does not need to
|
||||
# run on the standard HTTP port (80), there is no reason to start Unicorn
|
||||
# as root unless it's from system init scripts.
|
||||
# If running the master process as root and the workers as an unprivileged
|
||||
# user, do this to switch euid/egid in the workers (also chowns logs):
|
||||
# user "unprivileged_user", "unprivileged_group"
|
||||
|
||||
# Help ensure your application will always spawn in the symlinked
|
||||
# "current" directory that Capistrano sets up.
|
||||
working_directory ENV['gitlab_app_root'] # available in 0.94.0+
|
||||
|
||||
# Listen on both a Unix domain socket and a TCP port.
|
||||
# If you are load-balancing multiple Unicorn masters, lower the backlog
|
||||
# setting to e.g. 64 for faster failover.
|
||||
listen "#{ENV['gitlab_pid_path']}/gitlab.socket", :backlog => 1024
|
||||
listen "127.0.0.1:8080", :tcp_nopush => true
|
||||
|
||||
# nuke workers after 30 seconds instead of 60 seconds (the default)
|
||||
#
|
||||
# NOTICE: git push over http depends on this value.
|
||||
# If you want be able to push huge amount of data to git repository over http
|
||||
# you will have to increase this value too.
|
||||
#
|
||||
# Example of output if you try to push 1GB repo to GitLab over http.
|
||||
# -> git push http://gitlab.... master
|
||||
#
|
||||
# error: RPC failed; result=18, HTTP code = 200
|
||||
# fatal: The remote end hung up unexpectedly
|
||||
# fatal: The remote end hung up unexpectedly
|
||||
#
|
||||
# For more information see http://stackoverflow.com/a/21682112/752049
|
||||
#
|
||||
timeout 60
|
||||
|
||||
# feel free to point this anywhere accessible on the filesystem
|
||||
pid "#{ENV['gitlab_pid_path']}/unicorn.pid"
|
||||
|
||||
# By default, the Unicorn logger will write to stderr.
|
||||
# Additionally, some applications/frameworks log to stderr or stdout,
|
||||
# so prevent them from going to /dev/null when daemonized here:
|
||||
stderr_path File.join(ENV['gitlab_log_dir'],"unicorn.stderr.log")
|
||||
stdout_path File.join(ENV['gitlab_log_dir'],"unicorn.stdout.log")
|
||||
|
||||
# combine Ruby 2.0.0dev or REE with "preload_app true" for memory savings
|
||||
# http://rubyenterpriseedition.com/faq.html#adapt_apps_for_cow
|
||||
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
|
||||
# beginning of the HTTP headers before calling the application. This
|
||||
# prevents calling the application for connections that have disconnected
|
||||
# while queued. This is only guaranteed to detect clients on the same
|
||||
# host unicorn runs on, and unlikely to detect disconnects even on a
|
||||
# fast LAN.
|
||||
check_client_connection false
|
||||
|
||||
before_fork do |server, worker|
|
||||
# the following is highly recomended 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!
|
||||
|
||||
# The following is only recommended for memory/DB-constrained
|
||||
# installations. It is not needed if your system can house
|
||||
# twice as many worker_processes as you have configured.
|
||||
#
|
||||
# This allows a new master process to incrementally
|
||||
# phase out the old master process with SIGTTOU to avoid a
|
||||
# thundering herd (especially in the "preload_app false" case)
|
||||
# when doing a transparent upgrade. The last worker spawned
|
||||
# will then kill off the old master process with a SIGQUIT.
|
||||
old_pid = "#{server.config[:pid]}.oldbin"
|
||||
if old_pid != server.pid
|
||||
begin
|
||||
sig = (worker.nr + 1) >= server.worker_processes ? :QUIT : :TTOU
|
||||
Process.kill(sig, File.read(old_pid).to_i)
|
||||
rescue Errno::ENOENT, Errno::ESRCH
|
||||
end
|
||||
end
|
||||
#
|
||||
# Throttle the master from forking too quickly by sleeping. Due
|
||||
# to the implementation of standard Unix signal handlers, this
|
||||
# helps (but does not completely) prevent identical, repeated signals
|
||||
# from being lost when the receiving process is busy.
|
||||
# sleep 1
|
||||
end
|
||||
|
||||
after_fork do |server, worker|
|
||||
# per-process listener ports for debugging/admin/migrations
|
||||
# addr = "127.0.0.1:#{9293 + worker.nr}"
|
||||
# server.listen(addr, :tries => -1, :delay => 5, :tcp_nopush => true)
|
||||
|
||||
# the following is *required* for Rails + "preload_app true",
|
||||
defined?(ActiveRecord::Base) and
|
||||
ActiveRecord::Base.establish_connection
|
||||
|
||||
# if preload_app is true, then you may also want to check and
|
||||
# restart any other shared sockets/descriptors such as Memcached,
|
||||
# and Redis. TokyoCabinet file handles are safe to reuse
|
||||
# between any number of forked children (assuming your kernel
|
||||
# correctly implements pread()/pwrite() system calls)
|
||||
end
|
||||
2
debian/control
vendored
2
debian/control
vendored
|
|
@ -19,7 +19,7 @@ Section: contrib/net
|
|||
Architecture: all
|
||||
XB-Ruby-Versions: ${ruby:Versions}
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends},
|
||||
gitlab-common (>= 13.2~),
|
||||
gitlab-common (>= 13.2.1+dfsg-3~),
|
||||
ruby (>= 1:2.7~),
|
||||
rubygems-integration (>= 1.17.1~),
|
||||
lsb-base (>= 3.0-6),
|
||||
|
|
|
|||
4
debian/gitlab.gitlab-puma.service
vendored
4
debian/gitlab.gitlab-puma.service
vendored
|
|
@ -13,8 +13,8 @@ Type=simple
|
|||
WorkingDirectory=/usr/share/gitlab
|
||||
EnvironmentFile=/etc/gitlab/gitlab-debian.conf
|
||||
EnvironmentFile=-/etc/default/gitlab
|
||||
SyslogIdentifier=gitlab-unicorn
|
||||
ExecStart=/usr/bin/bundle exec puma -C config/unicorn.rb -e $RAILS_ENV
|
||||
SyslogIdentifier=gitlab-puma
|
||||
ExecStart=/usr/bin/bundle exec puma -C config/puma.rb -e $RAILS_ENV
|
||||
ExecReload=/bin/kill -USR2 $MAINPID
|
||||
Restart=on-abnormal
|
||||
|
||||
|
|
|
|||
2
debian/gitlab.install
vendored
2
debian/gitlab.install
vendored
|
|
@ -1,5 +1,5 @@
|
|||
debian/conf/gitlab etc/default
|
||||
debian/conf/unicorn.rb etc/gitlab
|
||||
debian/conf/puma.rb etc/gitlab
|
||||
debian/conf/database.yml etc/gitlab
|
||||
debian/conf/gitlab.yml.example usr/lib/gitlab/templates
|
||||
debian/conf/resque.yml etc/gitlab
|
||||
|
|
|
|||
Loading…
Reference in a new issue