diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-13 16:26:31 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-13 16:26:31 +0300 |
commit | b7dfe2ae4054aa40e15182fd3c6cb7dd39f131db (patch) | |
tree | 5ab080ca9cadeb6cd9578bf301e4e9e8810bed9e /app/workers | |
parent | 25cb337cf12438169f1b14bc5dace8a06a7356e3 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/workers')
-rw-r--r-- | app/workers/build_finished_worker.rb | 2 | ||||
-rw-r--r-- | app/workers/new_note_worker.rb | 2 | ||||
-rw-r--r-- | app/workers/post_receive.rb | 2 | ||||
-rw-r--r-- | app/workers/project_cache_worker.rb | 3 | ||||
-rw-r--r-- | app/workers/repository_check/batch_worker.rb | 2 | ||||
-rw-r--r-- | app/workers/repository_check/single_repository_worker.rb | 2 | ||||
-rw-r--r-- | app/workers/repository_import_worker.rb | 2 |
7 files changed, 14 insertions, 1 deletions
diff --git a/app/workers/build_finished_worker.rb b/app/workers/build_finished_worker.rb index 8e2a18a8fd8..e95b6b38d28 100644 --- a/app/workers/build_finished_worker.rb +++ b/app/workers/build_finished_worker.rb @@ -34,3 +34,5 @@ class BuildFinishedWorker ChatNotificationWorker.perform_async(build.id) if build.pipeline.chat? end end + +BuildFinishedWorker.prepend_if_ee('EE::BuildFinishedWorker') diff --git a/app/workers/new_note_worker.rb b/app/workers/new_note_worker.rb index 1d1ea926c21..7648af3a8b9 100644 --- a/app/workers/new_note_worker.rb +++ b/app/workers/new_note_worker.rb @@ -23,3 +23,5 @@ class NewNoteWorker end # rubocop: enable CodeReuse/ActiveRecord end + +NewNoteWorker.prepend_if_ee('EE::NewNoteWorker') diff --git a/app/workers/post_receive.rb b/app/workers/post_receive.rb index 61d34981458..843ba3e980e 100644 --- a/app/workers/post_receive.rb +++ b/app/workers/post_receive.rb @@ -117,3 +117,5 @@ class PostReceive Gitlab::GitLogger.error("POST-RECEIVE: #{message}") end end + +PostReceive.prepend_if_ee('EE::PostReceive') diff --git a/app/workers/project_cache_worker.rb b/app/workers/project_cache_worker.rb index 5ac860c93e0..e3f1f61991c 100644 --- a/app/workers/project_cache_worker.rb +++ b/app/workers/project_cache_worker.rb @@ -3,7 +3,6 @@ # Worker for updating any project specific caches. class ProjectCacheWorker include ApplicationWorker - LEASE_TIMEOUT = 15.minutes.to_i # project_id - The ID of the project for which to flush the cache. @@ -55,3 +54,5 @@ class ProjectCacheWorker ["project_cache_worker", project_id, *statistics.sort].join(":") end end + +ProjectCacheWorker.prepend_if_ee('EE::ProjectCacheWorker') diff --git a/app/workers/repository_check/batch_worker.rb b/app/workers/repository_check/batch_worker.rb index c1bb1adc9cc..4091c30f498 100644 --- a/app/workers/repository_check/batch_worker.rb +++ b/app/workers/repository_check/batch_worker.rb @@ -2,6 +2,8 @@ module RepositoryCheck class BatchWorker + prepend_if_ee('::EE::RepositoryCheck::BatchWorker') # rubocop: disable Cop/InjectEnterpriseEditionModule + include ApplicationWorker include RepositoryCheckQueue include ExclusiveLeaseGuard diff --git a/app/workers/repository_check/single_repository_worker.rb b/app/workers/repository_check/single_repository_worker.rb index a8097af321f..cadb1de356c 100644 --- a/app/workers/repository_check/single_repository_worker.rb +++ b/app/workers/repository_check/single_repository_worker.rb @@ -5,6 +5,8 @@ module RepositoryCheck include ApplicationWorker include RepositoryCheckQueue + prepend_if_ee('::EE::RepositoryCheck::SingleRepositoryWorker') # rubocop: disable Cop/InjectEnterpriseEditionModule + def perform(project_id) project = Project.find(project_id) healthy = project_healthy?(project) diff --git a/app/workers/repository_import_worker.rb b/app/workers/repository_import_worker.rb index dff9c8f50bf..5be439ecbc5 100644 --- a/app/workers/repository_import_worker.rb +++ b/app/workers/repository_import_worker.rb @@ -48,3 +48,5 @@ class RepositoryImportWorker project.gitlab_project_import? end end + +RepositoryImportWorker.prepend_if_ee('EE::RepositoryImportWorker') |