Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 1 deletions

diff --git a/lib/gitlab/metrics/prometheus.rb b/lib/gitlab/metrics/prometheus.rb
index f7480a8789e..757762499a9 100644
--- a/lib/gitlab/metrics/prometheus.rb
+++ b/lib/gitlab/metrics/prometheus.rb
@@ -62,10 +62,18 @@ module Gitlab
         end
 
         def error_detected!
+          set_error!(true)
+        end
+
+        def clear_errors!
+          set_error!(false)
+        end
+
+        def set_error!(status)
           clear_memoization(:prometheus_metrics_enabled)
 
           PROVIDER_MUTEX.synchronize do
-            @error = true
+            @error = status
           end
         end