summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/gitlab/middleware/unicorn_timeout_logger.rb11
1 files changed, 11 insertions, 0 deletions
diff --git a/lib/gitlab/middleware/unicorn_timeout_logger.rb b/lib/gitlab/middleware/unicorn_timeout_logger.rb
index ada229604c6..6da742ccd79 100644
--- a/lib/gitlab/middleware/unicorn_timeout_logger.rb
+++ b/lib/gitlab/middleware/unicorn_timeout_logger.rb
@@ -11,6 +11,14 @@ module Gitlab
end
def call(env)
+ if @timeout
+ log_timeout(env)
+ else
+ @app.call(env)
+ end
+ end
+
+ def log_timeout(env)
thr = Thread.new do
sleep(@timeout - 1)
@@ -33,6 +41,9 @@ module Gitlab
def load_timeout
unicorn_config = File.join(Rails.root, 'config/unicorn.rb')
+
+ return unless File.exist?(unicorn_config)
+
configurator = Unicorn::Configurator.new({ config_file: unicorn_config })
configurator.set[:timeout]
end