summaryrefslogtreecommitdiff
path: root/config/initializers
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-03-03 13:07:14 +0100
committerDouwe Maan <douwe@gitlab.com>2015-03-04 23:20:47 +0100
commit516bcabbf42d60db2ac989dce4c7187b2a1e5de9 (patch)
treebdc504df2af875908fd77ca2ca4fc8d962870207 /config/initializers
parent2f4656b5c7e2a9b351237432e76a7b928a1684b1 (diff)
downloadgitlab-ce-516bcabbf42d60db2ac989dce4c7187b2a1e5de9.tar.gz
Increase timeout for Git-over-HTTP requests.
Diffstat (limited to 'config/initializers')
-rw-r--r--config/initializers/timeout.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/config/initializers/timeout.rb b/config/initializers/timeout.rb
new file mode 100644
index 00000000000..bc88595cf26
--- /dev/null
+++ b/config/initializers/timeout.rb
@@ -0,0 +1,8 @@
+# Slowpoke extends Rack::Timeout to gracefully kill Unicorn workers so they can clean up state.
+Slowpoke.timeout = 60
+
+# The `Rack::Timeout` middleware kills requests after 60 seconds (as set above).
+# We're replacing it with our `Gitlab::Middleware::Timeout` that does the same,
+# except ignoring Git-over-HTTP requests, letting those take as long as they need.
+
+Rails.application.config.middleware.swap(Rack::Timeout, Gitlab::Middleware::Timeout)