diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-20 18:09:18 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-20 18:09:18 +0300 |
commit | 364f6f2e33e6f5eafe63b25d9256b88e72141b1c (patch) | |
tree | ee6dc003a354e7466d5c45e5587c0f8172312122 /lib/gitlab/request_context.rb | |
parent | 98252e0dd60cbcb316231085e206d9872f243b8a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/request_context.rb')
-rw-r--r-- | lib/gitlab/request_context.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/gitlab/request_context.rb b/lib/gitlab/request_context.rb index 49c2c0c982c..214670cac28 100644 --- a/lib/gitlab/request_context.rb +++ b/lib/gitlab/request_context.rb @@ -2,6 +2,7 @@ module Gitlab class RequestContext + include Gitlab::Utils::StrongMemoize include Singleton RequestDeadlineExceeded = Class.new(StandardError) @@ -15,10 +16,12 @@ module Gitlab end def request_deadline - return unless request_start_time - return unless Feature.enabled?(:request_deadline) + strong_memoize(:request_deadline) do + next unless request_start_time + next unless Feature.enabled?(:request_deadline) - @request_deadline ||= request_start_time + max_request_duration_seconds + request_start_time + max_request_duration_seconds + end end def ensure_deadline_not_exceeded! |