diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-11-14 21:03:53 +0100 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-11-14 21:03:53 +0100 |
| commit | a4e14ce375db0ee668c62a3954be144806c4d817 (patch) | |
| tree | 5635fcc10ae4ffd4d6d842de6bf34a857bdfa48b | |
| parent | c9cf892605f6663b60ee10c4bf5ff85bfa31c1ef (diff) | |
| download | gitlab-ce-move-pages-logic-to-single-worker.tar.gz | |
Pass pipeline ID and pages configmove-pages-logic-to-single-worker
| -rw-r--r-- | app/services/pages_service.rb | 7 | ||||
| -rw-r--r-- | app/workers/pages_worker.rb | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/app/services/pages_service.rb b/app/services/pages_service.rb index ae6ec0955ac..ce93d51b3d9 100644 --- a/app/services/pages_service.rb +++ b/app/services/pages_service.rb @@ -10,8 +10,11 @@ class PagesService return unless job.name == 'pages' return unless job.success? - PagesWorker.perform_async(:deploy, - job.project.id, job.project.full_path, job.id, + PagesWorker.perform_async( + :deploy, + job.project.id, job.project.full_path, + job.commit_id, + job.id, job.project.pages_config) end end diff --git a/app/workers/pages_worker.rb b/app/workers/pages_worker.rb index 7664346d4d1..938a2e16135 100644 --- a/app/workers/pages_worker.rb +++ b/app/workers/pages_worker.rb @@ -7,7 +7,7 @@ class PagesWorker send(action, *arg) # rubocop:disable GitlabSecurity/PublicSend end - def deploy(project_id, project_path, build_id) + def deploy(project_id, project_path, pipeline_id, build_id, pages_config) build = Ci::Build.find_by(id: build_id) result = Projects::UpdatePagesService.new(build.project, build).execute if result[:status] == :success |