summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2018-02-21 15:51:19 +0000
committerRobert Speicher <robert@gitlab.com>2018-02-21 15:51:19 +0000
commit1df01bb742bf8f651b928a9c7e80e9e80034f0cf (patch)
tree02ac3f96685897fd044f562d9f3f4a7936fd61fc /lib
parent4bd3041418a1deb48887c459878b88b58cb703eb (diff)
parent3b3615f0b78d728b9b3fa15971e4f597a9e3cb1d (diff)
downloadgitlab-ce-1df01bb742bf8f651b928a9c7e80e9e80034f0cf.tar.gz
Merge branch 'sh-guard-against-nil-sidekiq-metrics-server' into 'master'
Guard against nil Sidekiq metrics server Closes #41351 See merge request gitlab-org/gitlab-ce!17254
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/metrics/sidekiq_metrics_exporter.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/metrics/sidekiq_metrics_exporter.rb b/lib/gitlab/metrics/sidekiq_metrics_exporter.rb
index 5980a4ded2b..db8bdde74b2 100644
--- a/lib/gitlab/metrics/sidekiq_metrics_exporter.rb
+++ b/lib/gitlab/metrics/sidekiq_metrics_exporter.rb
@@ -23,7 +23,7 @@ module Gitlab
end
def stop_working
- server.shutdown
+ server.shutdown if server
@server = nil
end