diff options
Diffstat (limited to 'app')
-rw-r--r-- | app/services/ci/create_artifacts_trace_service.rb | 16 | ||||
-rw-r--r-- | app/services/ci/create_trace_artifact_service.rb | 14 | ||||
-rw-r--r-- | app/workers/build_finished_worker.rb | 2 | ||||
-rw-r--r-- | app/workers/create_artifacts_trace_worker.rb | 8 | ||||
-rw-r--r-- | app/workers/create_trace_artifact_worker.rb | 10 |
5 files changed, 25 insertions, 25 deletions
diff --git a/app/services/ci/create_artifacts_trace_service.rb b/app/services/ci/create_artifacts_trace_service.rb deleted file mode 100644 index eefc2ae13ea..00000000000 --- a/app/services/ci/create_artifacts_trace_service.rb +++ /dev/null @@ -1,16 +0,0 @@ -module Ci - class CreateArtifactsTraceService < BaseService - def execute(job_id) - Ci::Build.find_by(id: job_id).try do |job| - return if job.job_artifacts_trace - - job.trace.read do |stream| - job.create_job_artifacts_trace!( - project: job.project, - file_type: :trace, - file: stream.path) if stream.file? - end - end - end - end -end diff --git a/app/services/ci/create_trace_artifact_service.rb b/app/services/ci/create_trace_artifact_service.rb new file mode 100644 index 00000000000..80e41856719 --- /dev/null +++ b/app/services/ci/create_trace_artifact_service.rb @@ -0,0 +1,14 @@ +module Ci + class CreateTraceArtifactService < BaseService + def execute(job) + return if job.job_artifacts_trace + + job.trace.read do |stream| + job.create_job_artifacts_trace!( + project: job.project, + file_type: :trace, + file: stream.path) if stream.file? + end + end + end +end diff --git a/app/workers/build_finished_worker.rb b/app/workers/build_finished_worker.rb index 842ab7bbbe4..d5a4b6c1553 100644 --- a/app/workers/build_finished_worker.rb +++ b/app/workers/build_finished_worker.rb @@ -7,7 +7,7 @@ class BuildFinishedWorker def perform(build_id) Ci::Build.find_by(id: build_id).try do |build| BuildTraceSectionsWorker.perform_async(build.id) - CreateArtifactsTraceWorker.perform_async(build.id) + CreateTraceArtifactWorker.perform_async(build.id) BuildCoverageWorker.new.perform(build.id) BuildHooksWorker.new.perform(build.id) end diff --git a/app/workers/create_artifacts_trace_worker.rb b/app/workers/create_artifacts_trace_worker.rb deleted file mode 100644 index d73951b0905..00000000000 --- a/app/workers/create_artifacts_trace_worker.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateArtifactsTraceWorker - include ApplicationWorker - include PipelineQueue - - def perform(job_id) - Ci::CreateArtifactsTraceService.new.execute(job_id) - end -end diff --git a/app/workers/create_trace_artifact_worker.rb b/app/workers/create_trace_artifact_worker.rb new file mode 100644 index 00000000000..40d8a086cfb --- /dev/null +++ b/app/workers/create_trace_artifact_worker.rb @@ -0,0 +1,10 @@ +class CreateTraceArtifactWorker + include ApplicationWorker + include PipelineQueue + + def perform(job_id) + Ci::Build.find_by(id: job_id).try do |job| + Ci::CreateTraceArtifactService.new.execute(job) + end + end +end |