From a824c04e2bebca6a7cb236c0e8bcbe27e3c17463 Mon Sep 17 00:00:00 2001 From: Max Melentiev Date: Wed, 19 Dec 2018 12:08:42 +0530 Subject: [PATCH] Remove old upload worker --- lib/paperclip/storage.rb | 1 + lib/paperclip/storage/cached.rb | 2 -- lib/paperclip/storage/delayeds3.rb | 20 -------------------- 3 files changed, 1 insertion(+), 22 deletions(-) diff --git a/lib/paperclip/storage.rb b/lib/paperclip/storage.rb index 800f6f7..4f46344 100644 --- a/lib/paperclip/storage.rb +++ b/lib/paperclip/storage.rb @@ -1,6 +1,7 @@ module Paperclip module Storage autoload :Filesystem, 'paperclip/storage/filesystem' + autoload :DelayedUpload, 'paperclip/storage/delayed_upload' autoload :Delayeds3, 'paperclip/storage/delayeds3' autoload :Cached, 'paperclip/storage/cached' end diff --git a/lib/paperclip/storage/cached.rb b/lib/paperclip/storage/cached.rb index ebc952f..0957183 100644 --- a/lib/paperclip/storage/cached.rb +++ b/lib/paperclip/storage/cached.rb @@ -1,5 +1,3 @@ -require_relative './delayed_upload' - module Paperclip module Storage # Saves file to `:cache` store, and run jobs to copy files to one ore more `:store` store. diff --git a/lib/paperclip/storage/delayeds3.rb b/lib/paperclip/storage/delayeds3.rb index a4afa56..7053add 100644 --- a/lib/paperclip/storage/delayeds3.rb +++ b/lib/paperclip/storage/delayeds3.rb @@ -5,8 +5,6 @@ rescue LoadError => e raise e end -require_relative './delayed_upload' - module Paperclip module Storage # Need to create boolean field synced_to_s3 @@ -76,24 +74,6 @@ module Paperclip end end - # TODO: Remove legacy workers after migrating to DelayedUpload worker. - class UploadWorker - include ::Sidekiq::Worker - sidekiq_options queue: :paperclip - - def perform(class_name, name, id) - DelayedUpload.new.perform(class_name, id, name, self.class::STORE_ID) - end - end - - class WriteToS3Worker < UploadWorker - STORE_ID = :s3 - end - - class WriteToFogWorker < UploadWorker - STORE_ID = :fog - end - delegate :synced_to_s3_field, :synced_to_fog_field, to: :class def initialize(*)