diff options
author | Stan Hu <stanhu@gmail.com> | 2016-11-23 21:03:33 -0800 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2016-11-23 21:51:26 -0800 |
commit | b403a88ab531349d54416d4482b0dcd338494a82 (patch) | |
tree | 70de13a38cf70c7f29c7274acc0499805191a98c | |
parent | e1532aeea91810dd10b6cc39f0277798cd8c0702 (diff) | |
download | gitlab-ce-unicorn-timeout-logger.tar.gz |
Only attempt to log Unicorn timeout if the file existsunicorn-timeout-logger
Prefer File.exist? to File.exists?
-rw-r--r-- | lib/gitlab/middleware/unicorn_timeout_logger.rb | 11 |
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 |