diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-07-03 15:12:30 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-07-03 15:12:30 +0000 |
| commit | 80bb04ebbd27d08dfd263ba00f8e0612a3e486af (patch) | |
| tree | 3b78c3611d23673e324bc1e19f60bb98f63f0c7c | |
| parent | 406b67ca824790a5965b44ac76f87db68037248f (diff) | |
| parent | eaf58debac14474dc7ad5e5a6a6fc88da0af1370 (diff) | |
| download | gitlab-ce-61056-data-improvements-for-contribution-analytics.tar.gz | |
Merge branch 'do-not-save-peek-request-for-unauthenticated-users' into 'master'61056-data-improvements-for-contribution-analytics
Only save Peek session in Redis when Peek is enabled
See merge request gitlab-org/gitlab-ce!30306
| -rw-r--r-- | config/initializers/peek.rb | 3 | ||||
| -rw-r--r-- | lib/gitlab/performance_bar/redis_adapter_when_peek_enabled.rb | 12 |
2 files changed, 15 insertions, 0 deletions
diff --git a/config/initializers/peek.rb b/config/initializers/peek.rb index cb108416b10..d492b60705d 100644 --- a/config/initializers/peek.rb +++ b/config/initializers/peek.rb @@ -42,3 +42,6 @@ class PEEK_DB_CLIENT end PEEK_DB_VIEW.prepend ::Gitlab::PerformanceBar::PeekQueryTracker + +require 'peek/adapters/redis' +Peek::Adapters::Redis.prepend ::Gitlab::PerformanceBar::RedisAdapterWhenPeekEnabled diff --git a/lib/gitlab/performance_bar/redis_adapter_when_peek_enabled.rb b/lib/gitlab/performance_bar/redis_adapter_when_peek_enabled.rb new file mode 100644 index 00000000000..2d997760c46 --- /dev/null +++ b/lib/gitlab/performance_bar/redis_adapter_when_peek_enabled.rb @@ -0,0 +1,12 @@ +# frozen_string_literal: true + +# Adapted from https://github.com/peek/peek/blob/master/lib/peek/adapters/redis.rb +module Gitlab + module PerformanceBar + module RedisAdapterWhenPeekEnabled + def save + super unless ::Peek.request_id.blank? + end + end + end +end |