summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Provaznik <jprovaznik@gitlab.com>2019-05-29 09:35:43 +0200
committerJan Provaznik <jprovaznik@gitlab.com>2019-05-29 14:34:15 +0200
commit946183793b58cee87fb5ebf6c1d027a7d8d0c0a9 (patch)
tree1e97becd77ac543f39c6d255ede51c5aff0d2cbf
parent7b8bd6fd9cd9b813ae3575b08c869be767a10104 (diff)
downloadgitlab-ce-rack-timeout.tar.gz
Removed attr_reader and new line in docrack-timeout
-rw-r--r--lib/gitlab/rack_timeout_observer.rb4
-rw-r--r--spec/lib/gitlab/rack_timeout_observer_spec.rb8
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/gitlab/rack_timeout_observer.rb b/lib/gitlab/rack_timeout_observer.rb
index 1798e4bdb96..80d3f7dea60 100644
--- a/lib/gitlab/rack_timeout_observer.rb
+++ b/lib/gitlab/rack_timeout_observer.rb
@@ -2,8 +2,6 @@
module Gitlab
class RackTimeoutObserver
- attr_reader :counter
-
def initialize
@counter = Gitlab::Metrics.counter(:rack_state_total, 'Number of requests in a given rack state')
end
@@ -19,7 +17,7 @@ module Gitlab
info = env[::Rack::Timeout::ENV_INFO_KEY]
return unless info
- counter.increment(labels(info, env))
+ @counter.increment(labels(info, env))
end
def labels(info, env)
diff --git a/spec/lib/gitlab/rack_timeout_observer_spec.rb b/spec/lib/gitlab/rack_timeout_observer_spec.rb
index 5191b4f7db7..3dc1a8b68fb 100644
--- a/spec/lib/gitlab/rack_timeout_observer_spec.rb
+++ b/spec/lib/gitlab/rack_timeout_observer_spec.rb
@@ -3,10 +3,12 @@
require 'spec_helper'
describe Gitlab::RackTimeoutObserver do
+ let(:counter) { Gitlab::Metrics::NullMetric.instance }
+
before do
allow(Gitlab::Metrics).to receive(:counter)
.with(any_args)
- .and_return(Gitlab::Metrics::NullMetric.instance)
+ .and_return(counter)
end
describe '#callback' do
@@ -24,7 +26,7 @@ describe Gitlab::RackTimeoutObserver do
subject { described_class.new }
it 'increments timeout counter' do
- expect(subject.counter)
+ expect(counter)
.to receive(:increment)
.with({ controller: 'foo', action: 'bar', route: nil, state: :timed_out })
@@ -45,7 +47,7 @@ describe Gitlab::RackTimeoutObserver do
it 'increments timeout counter' do
allow(endpoint).to receive_message_chain('route.pattern.origin') { 'foobar' }
- expect(subject.counter)
+ expect(counter)
.to receive(:increment)
.with({ controller: nil, action: nil, route: 'foobar', state: :expired })