Commit 45805f78 authored by Peter Leitzen's avatar Peter Leitzen

Merge branch 'app-logger-19' into 'master'

Use AppLogger in files in lib/gitlab

See merge request gitlab-org/gitlab!41302
parents d690637a 4a78d525
---
title: Use GitLab AppLogger in files in lib/gitlab/*
merge_request: 41302
author: Rajendra Kadam
type: other
...@@ -57,13 +57,13 @@ module Gitlab ...@@ -57,13 +57,13 @@ module Gitlab
def self.normalize_uid(uid) def self.normalize_uid(uid)
::Gitlab::Auth::Ldap::DN.normalize_value(uid) ::Gitlab::Auth::Ldap::DN.normalize_value(uid)
rescue ::Gitlab::Auth::Ldap::DN::FormatError => e rescue ::Gitlab::Auth::Ldap::DN::FormatError => e
Rails.logger.info("Returning original UID \"#{uid}\" due to error during normalization attempt: #{e.message}") # rubocop:disable Gitlab/RailsLogger Gitlab::AppLogger.info("Returning original UID \"#{uid}\" due to error during normalization attempt: #{e.message}")
uid uid
end end
def initialize(entry, provider) def initialize(entry, provider)
Rails.logger.debug { "Instantiating #{self.class.name} with LDIF:\n#{entry.to_ldif}" } # rubocop:disable Gitlab/RailsLogger Gitlab::AppLogger.debug "Instantiating #{self.class.name} with LDIF:\n#{entry.to_ldif}"
@entry = entry @entry = entry
@provider = provider @provider = provider
end end
......
...@@ -9,7 +9,7 @@ module Gitlab ...@@ -9,7 +9,7 @@ module Gitlab
end end
def perform(start_id, stop_id) def perform(start_id, stop_id)
Rails.logger.info("Setting commits_count for merge request diffs: #{start_id} - #{stop_id}") # rubocop:disable Gitlab/RailsLogger Gitlab::AppLogger.info("Setting commits_count for merge request diffs: #{start_id} - #{stop_id}")
update = ' update = '
commits_count = ( commits_count = (
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment