use proper `if defined?` check.

5f2dc999 · Pawel Chojnacki · ed5c7d11 · 5f2dc999
Commit 5f2dc999 authored Jun 20, 2017 by Pawel Chojnacki
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

prometheus.rb lib/gitlab/metrics/prometheus.rb +5 -2

No files found.
--- a/lib/gitlab/metrics/prometheus.rb
+++ b/lib/gitlab/metrics/prometheus.rb
@@ -6,12 +6,15 @@ module Gitlab
      include Gitlab::CurrentSettings

      def metrics_folder_present?
-        ENV.has_key?('prometheus_multiproc_dir') && ::Dir.exist?(ENV['prometheus_multiproc_dir']) &&
+        ENV.has_key?('prometheus_multiproc_dir') &&
+          ::Dir.exist?(ENV['prometheus_multiproc_dir']) &&
          ::File.writable?(ENV['prometheus_multiproc_dir'])
      end

      def prometheus_metrics_enabled?
-        @prometheus_metrics_enabled ||= prometheus_metrics_enabled_unmemoized
+        return @prometheus_metrics_enabled if defined?(@prometheus_metrics_enabled)
+
+        @prometheus_metrics_enabled = prometheus_metrics_enabled_unmemoized
      end

      def registry