From 85dc423f7090da0a52c73eb66faf22ddb20efff9 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Sat, 19 Sep 2020 01:45:44 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-4-stable-ee --- lib/gitlab/database.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/gitlab/database.rb') diff --git a/lib/gitlab/database.rb b/lib/gitlab/database.rb index 990c940d200..accc6330253 100644 --- a/lib/gitlab/database.rb +++ b/lib/gitlab/database.rb @@ -335,7 +335,7 @@ module Gitlab end rescue Prometheus::Client::LabelSetValidator::LabelSetError => err # Ensure that errors in recording these metrics don't affect the operation of the application - Rails.logger.error("Unable to observe database transaction duration: #{err}") # rubocop:disable Gitlab/RailsLogger + Gitlab::AppLogger.error("Unable to observe database transaction duration: #{err}") end # MonkeyPatch for ActiveRecord::Base for adding observability -- cgit v1.2.3