Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'lib/gitlab/bitbucket_server_import/importer.rb')
-rw-r--r--lib/gitlab/bitbucket_server_import/importer.rb24
1 files changed, 2 insertions, 22 deletions
diff --git a/lib/gitlab/bitbucket_server_import/importer.rb b/lib/gitlab/bitbucket_server_import/importer.rb
index ea9b79c12fd..6b163cd1b2d 100644
--- a/lib/gitlab/bitbucket_server_import/importer.rb
+++ b/lib/gitlab/bitbucket_server_import/importer.rb
@@ -3,9 +3,10 @@
module Gitlab
module BitbucketServerImport
class Importer
+ include Loggable
+
attr_reader :recover_missing_commits
attr_reader :project, :project_key, :repository_slug, :client, :errors, :users, :already_imported_cache_key
- attr_accessor :logger
BATCH_SIZE = 100
# The base cache key to use for tracking already imported objects.
@@ -38,7 +39,6 @@ module Gitlab
@errors = []
@users = {}
@temp_branches = []
- @logger = Gitlab::Import::Logger.build
@already_imported_cache_key = ALREADY_IMPORTED_CACHE_KEY %
{ project: project.id, collection: collection_method }
end
@@ -427,26 +427,6 @@ module Gitlab
}
end
- def log_debug(details)
- logger.debug(log_base_data.merge(details))
- end
-
- def log_info(details)
- logger.info(log_base_data.merge(details))
- end
-
- def log_warn(details)
- logger.warn(log_base_data.merge(details))
- end
-
- def log_base_data
- {
- class: self.class.name,
- project_id: project.id,
- project_path: project.full_path
- }
- end
-
def metrics
@metrics ||= Gitlab::Import::Metrics.new(:bitbucket_server_importer, @project)
end