summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2014-09-12 13:43:52 +0200
committerJacob Vosmaer <contact@jacobvosmaer.nl>2014-09-12 13:43:52 +0200
commite645b9a9d5e7c80b7a445d2b792d24e05bbdc6a8 (patch)
tree8da301c3910ad6806f73c91b3fd8036db4474128 /config
parenta034a4665229425d5b3eff3082069b9ab1b57ab4 (diff)
downloadgitlab-ce-e645b9a9d5e7c80b7a445d2b792d24e05bbdc6a8.tar.gz
Use the default Unicorn socket backlog value: 1024
Diffstat (limited to 'config')
-rw-r--r--config/unicorn.rb.example7
1 files changed, 4 insertions, 3 deletions
diff --git a/config/unicorn.rb.example b/config/unicorn.rb.example
index e88a4522338..c19a37ed062 100644
--- a/config/unicorn.rb.example
+++ b/config/unicorn.rb.example
@@ -28,9 +28,10 @@ worker_processes 2
# "current" directory that Capistrano sets up.
working_directory "/home/git/gitlab" # available in 0.94.0+
-# listen on both a Unix domain socket and a TCP port,
-# we use a shorter backlog for quicker failover when busy
-listen "/home/git/gitlab/tmp/sockets/gitlab.socket", :backlog => 64
+# 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 "/home/git/gitlab/tmp/sockets/gitlab.socket", :backlog => 1024
listen "127.0.0.1:8080", :tcp_nopush => true
# nuke workers after 30 seconds instead of 60 seconds (the default)