diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-06-21 20:25:38 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-06-21 20:25:38 +0300 |
| commit | 4be8348ee3aa37d2d0d215e070f7c29fc1d67397 (patch) | |
| tree | c4efe4d38f876f64e53ee8ddb55d11ff10ca707b /app/workers | |
| parent | e005e59b9c687fcb86c2d73154985c97c3ab5a2a (diff) | |
| parent | 5b6e6605fbb8c03689ed6a76962086812669083e (diff) | |
Merge branch 'move-remote-mirror-to-exclusive-queue' into 'master'
Moves remote mirror, import and fork workers to their own queue
See merge request !2177
Diffstat (limited to 'app/workers')
| -rw-r--r-- | app/workers/repository_update_mirror_worker.rb | 3 | ||||
| -rw-r--r-- | app/workers/repository_update_remote_mirror_worker.rb | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/workers/repository_update_mirror_worker.rb b/app/workers/repository_update_mirror_worker.rb index eec37699df0..6af5d5f90a9 100644 --- a/app/workers/repository_update_mirror_worker.rb +++ b/app/workers/repository_update_mirror_worker.rb @@ -4,9 +4,10 @@ class RepositoryUpdateMirrorWorker include Sidekiq::Worker include Gitlab::ShellAdapter + include DedicatedSidekiqQueue # Retry not neccessary. It will try again at the next update interval. - sidekiq_options queue: :project_mirror, retry: false + sidekiq_options retry: false attr_accessor :project, :repository, :current_user diff --git a/app/workers/repository_update_remote_mirror_worker.rb b/app/workers/repository_update_remote_mirror_worker.rb index b77dbc7a4b7..3ba65aa5bfc 100644 --- a/app/workers/repository_update_remote_mirror_worker.rb +++ b/app/workers/repository_update_remote_mirror_worker.rb @@ -4,8 +4,9 @@ class RepositoryUpdateRemoteMirrorWorker include Sidekiq::Worker include Gitlab::ShellAdapter + include DedicatedSidekiqQueue - sidekiq_options queue: :project_mirror, retry: 3, dead: false + sidekiq_options retry: 3, dead: false sidekiq_retry_in { |count| 30 * count } |