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/pages')
-rw-r--r--lib/gitlab/pages/migration_helper.rb53
-rw-r--r--lib/gitlab/pages/settings.rb6
-rw-r--r--lib/gitlab/pages/stores/local_store.rb15
3 files changed, 1 insertions, 73 deletions
diff --git a/lib/gitlab/pages/migration_helper.rb b/lib/gitlab/pages/migration_helper.rb
deleted file mode 100644
index 8f8667fafd9..00000000000
--- a/lib/gitlab/pages/migration_helper.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
- module Pages
- class MigrationHelper
- def initialize(logger = nil)
- @logger = logger
- end
-
- def migrate_to_remote_storage
- deployments = ::PagesDeployment.with_files_stored_locally
- migrate(deployments, ObjectStorage::Store::REMOTE)
- end
-
- def migrate_to_local_storage
- deployments = ::PagesDeployment.with_files_stored_remotely
- migrate(deployments, ObjectStorage::Store::LOCAL)
- end
-
- private
-
- def batch_size
- ENV.fetch('MIGRATION_BATCH_SIZE', 10).to_i
- end
-
- def migrate(deployments, store)
- deployments.find_each(batch_size: batch_size) do |deployment| # rubocop:disable CodeReuse/ActiveRecord
- deployment.file.migrate!(store)
-
- log_success(deployment, store)
- rescue => e
- log_error(e, deployment)
- end
- end
-
- def log_success(deployment, store)
- logger.info("Transferred deployment ID #{deployment.id} of type #{deployment.file_type} with size #{deployment.size} to #{storage_label(store)} storage")
- end
-
- def log_error(err, deployment)
- logger.warn("Failed to transfer deployment of type #{deployment.file_type} and ID #{deployment.id} with error: #{err.message}")
- end
-
- def storage_label(store)
- if store == ObjectStorage::Store::LOCAL
- 'local'
- else
- 'object'
- end
- end
- end
- end
-end
diff --git a/lib/gitlab/pages/settings.rb b/lib/gitlab/pages/settings.rb
index be71018e851..b35683c9dec 100644
--- a/lib/gitlab/pages/settings.rb
+++ b/lib/gitlab/pages/settings.rb
@@ -11,10 +11,6 @@ module Gitlab
super
end
- def local_store
- @local_store ||= ::Gitlab::Pages::Stores::LocalStore.new(super)
- end
-
private
def disk_access_denied?
@@ -25,7 +21,7 @@ module Gitlab
def report_denied_disk_access
raise DiskAccessDenied if disk_access_denied?
- rescue => e
+ rescue StandardError => e
::Gitlab::ErrorTracking.track_exception(e)
end
end
diff --git a/lib/gitlab/pages/stores/local_store.rb b/lib/gitlab/pages/stores/local_store.rb
deleted file mode 100644
index 68a7ebaceff..00000000000
--- a/lib/gitlab/pages/stores/local_store.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
- module Pages
- module Stores
- class LocalStore < ::SimpleDelegator
- def enabled
- return false unless Feature.enabled?(:pages_update_legacy_storage, default_enabled: true)
-
- super
- end
- end
- end
- end
-end