diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-12 16:22:01 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-12 16:22:01 +0000 |
| commit | 29f990002c6e2704bb25ba4aa89491f319699202 (patch) | |
| tree | 03bb188f9e6f2992d320e2661e0621eb0779f95f | |
| parent | cbb44b9da3e7288200485caed7a9716013e34984 (diff) | |
| parent | e645b9a9d5e7c80b7a445d2b792d24e05bbdc6a8 (diff) | |
| download | gitlab-ce-29f990002c6e2704bb25ba4aa89491f319699202.tar.gz | |
Merge branch 'backlog_socket' into 'master'
Use the default Unicorn socket backlog value: 1024
See merge request !1087
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | config/unicorn.rb.example | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index 49bf983eb5e..d288daac6a3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,6 +7,7 @@ v 7.3.0 - Better search with filtering, pagination etc - Added a checkbox to toggle line wrapping in diff (Yuriy Glukhov) - Prevent project stars duplication when fork project + - Use the default Unicorn socket backlog value of 1024 - Support Unix domain sockets for Redis - Store session Redis keys in 'session:gitlab:' namespace - Deprecate LDAP account takeover based on partial LDAP email / GitLab username match 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) |