Commit 23f8f880 authored by Sean McGivern's avatar Sean McGivern

Move Phabricator import workers to correct location

These should be in app/workers. If they aren't, they won't be picked up
by every_sidekiq_worker_spec.rb, and their queues won't be guaranteed to
be in all_queues.yml, which in turn prevents sidekiq-cluster from seeing
them.

Making the BaseWorker not include ApplicationWorker means that we don't
need to act as if it has its own queue. (See HashedStorage::BaseWorker,
which does the same thing.)
parent fdd4a846
...@@ -192,3 +192,4 @@ ...@@ -192,3 +192,4 @@
- self_monitoring_project_create - self_monitoring_project_create
- self_monitoring_project_delete - self_monitoring_project_delete
- merge_request_mergeability_check - merge_request_mergeability_check
- phabricator_import_import_tasks
...@@ -19,8 +19,7 @@ ...@@ -19,8 +19,7 @@
module Gitlab module Gitlab
module PhabricatorImport module PhabricatorImport
class BaseWorker class BaseWorker
include ApplicationWorker include WorkerAttributes
include ProjectImportOptions # This marks the project as failed after too many tries
include Gitlab::ExclusiveLeaseHelpers include Gitlab::ExclusiveLeaseHelpers
feature_category :importers feature_category :importers
......
...@@ -2,6 +2,9 @@ ...@@ -2,6 +2,9 @@
module Gitlab module Gitlab
module PhabricatorImport module PhabricatorImport
class ImportTasksWorker < BaseWorker class ImportTasksWorker < BaseWorker
include ApplicationWorker
include ProjectImportOptions # This marks the project as failed after too many tries
def importer_class def importer_class
Gitlab::PhabricatorImport::Issues::Importer Gitlab::PhabricatorImport::Issues::Importer
end end
......
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