From 184c2ced0761bd8dd7032619d16d3983fed7944a Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 17 Oct 2019 18:08:05 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- lib/gitlab/request_context.rb | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'lib/gitlab/request_context.rb') diff --git a/lib/gitlab/request_context.rb b/lib/gitlab/request_context.rb index ab2549d5e68..13187836e02 100644 --- a/lib/gitlab/request_context.rb +++ b/lib/gitlab/request_context.rb @@ -6,6 +6,10 @@ module Gitlab def client_ip Gitlab::SafeRequestStore[:client_ip] end + + def start_thread_cpu_time + Gitlab::SafeRequestStore[:start_thread_cpu_time] + end end def initialize(app) @@ -23,6 +27,8 @@ module Gitlab Gitlab::SafeRequestStore[:client_ip] = req.ip + Gitlab::SafeRequestStore[:start_thread_cpu_time] = Gitlab::Metrics::System.thread_cpu_time + @app.call(env) end end -- cgit v1.2.3