diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-19 17:57:37 -0700 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-19 18:29:20 -0700 |
commit | efd8491d4906d190abc5e190a2111c04b01b729b (patch) | |
tree | ca858ca36181fa37c1e81bf265c676c17cf7c088 /config/unicorn.rb.example | |
parent | 915c7b94558170683570f43aa6cb4dcd9fd7f936 (diff) | |
download | gitlab-ce-efd8491d4906d190abc5e190a2111c04b01b729b.tar.gz |
Revert "Increase timeout for Git-over-HTTP requests."
This reverts commit 516bcabbf42d60db2ac989dce4c7187b2a1e5de9.
Conflicts:
Gemfile
Diffstat (limited to 'config/unicorn.rb.example')
-rw-r--r-- | config/unicorn.rb.example | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/config/unicorn.rb.example b/config/unicorn.rb.example index 3aee718097f..86a5512e761 100644 --- a/config/unicorn.rb.example +++ b/config/unicorn.rb.example @@ -35,10 +35,22 @@ working_directory "/home/git/gitlab" # available in 0.94.0+ listen "/home/git/gitlab/tmp/sockets/gitlab.socket", :backlog => 1024 listen "127.0.0.1:8080", :tcp_nopush => true -# Kill workers after 1 hour. -# A shorter timeout of 60 seconds is enforced by rack-timeout for web requests. -# Git-over-HTTP only has the below timeout since large pulls/pushes can take a long time. -timeout 60 * 60 +# 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 "/home/git/gitlab/tmp/pids/unicorn.pid" |