summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Reigel <mail@koffeinfrei.org>2017-07-26 16:01:24 +0200
committerAlexis Reigel <mail@koffeinfrei.org>2017-07-27 15:46:04 +0200
commit7f7e93a34471f673ac3888549c67bce4e763300e (patch)
tree0a8aaba288d2fd56b0e46b15c0fd5aba60fb854d
parentf1ccecc9979e3091e7cf54f98508f6bc7c01a7f5 (diff)
downloadgitlab-ce-7f7e93a34471f673ac3888549c67bce4e763300e.tar.gz
remove log statements from workers
-rw-r--r--app/workers/create_gpg_signature_worker.rb8
-rw-r--r--app/workers/invalid_gpg_signature_update_worker.rb4
-rw-r--r--spec/workers/create_gpg_signature_worker_spec.rb14
-rw-r--r--spec/workers/invalid_gpg_signature_update_worker_spec.rb7
4 files changed, 3 insertions, 30 deletions
diff --git a/app/workers/create_gpg_signature_worker.rb b/app/workers/create_gpg_signature_worker.rb
index 6fbd6e1a3f3..4f47717ff69 100644
--- a/app/workers/create_gpg_signature_worker.rb
+++ b/app/workers/create_gpg_signature_worker.rb
@@ -5,15 +5,11 @@ class CreateGpgSignatureWorker
def perform(commit_sha, project_id)
project = Project.find_by(id: project_id)
- unless project
- return Rails.logger.error("CreateGpgSignatureWorker: couldn't find project with ID=#{project_id}, skipping job")
- end
+ return unless project
commit = project.commit(commit_sha)
- unless commit
- return Rails.logger.error("CreateGpgSignatureWorker: couldn't find commit with commit_sha=#{commit_sha}, skipping job")
- end
+ return unless commit
commit.signature
end
diff --git a/app/workers/invalid_gpg_signature_update_worker.rb b/app/workers/invalid_gpg_signature_update_worker.rb
index c0bec3c9689..db6b1ea8e8d 100644
--- a/app/workers/invalid_gpg_signature_update_worker.rb
+++ b/app/workers/invalid_gpg_signature_update_worker.rb
@@ -5,9 +5,7 @@ class InvalidGpgSignatureUpdateWorker
def perform(gpg_key_id)
gpg_key = GpgKey.find_by(id: gpg_key_id)
- unless gpg_key
- return Rails.logger.error("InvalidGpgSignatureUpdateWorker: couldn't find gpg_key with ID=#{gpg_key_id}, skipping job")
- end
+ return unless gpg_key
Gitlab::Gpg::InvalidGpgSignatureUpdater.new(gpg_key).run
end
diff --git a/spec/workers/create_gpg_signature_worker_spec.rb b/spec/workers/create_gpg_signature_worker_spec.rb
index a23f0d6c34a..c6a17d77d73 100644
--- a/spec/workers/create_gpg_signature_worker_spec.rb
+++ b/spec/workers/create_gpg_signature_worker_spec.rb
@@ -20,13 +20,6 @@ describe CreateGpgSignatureWorker do
let(:nonexisting_commit_sha) { 'bogus' }
let(:project) { create :project }
- it 'logs CreateGpgSignatureWorker process skipping' do
- expect(Rails.logger).to receive(:error)
- .with("CreateGpgSignatureWorker: couldn't find commit with commit_sha=bogus, skipping job")
-
- described_class.new.perform(nonexisting_commit_sha, project.id)
- end
-
it 'does not raise errors' do
expect { described_class.new.perform(nonexisting_commit_sha, project.id) }.not_to raise_error
end
@@ -41,13 +34,6 @@ describe CreateGpgSignatureWorker do
context 'when Project is not found' do
let(:nonexisting_project_id) { -1 }
- it 'logs CreateGpgSignatureWorker process skipping' do
- expect(Rails.logger).to receive(:error)
- .with("CreateGpgSignatureWorker: couldn't find project with ID=-1, skipping job")
-
- described_class.new.perform(anything, nonexisting_project_id)
- end
-
it 'does not raise errors' do
expect { described_class.new.perform(anything, nonexisting_project_id) }.not_to raise_error
end
diff --git a/spec/workers/invalid_gpg_signature_update_worker_spec.rb b/spec/workers/invalid_gpg_signature_update_worker_spec.rb
index 8d568076e1a..5972696515b 100644
--- a/spec/workers/invalid_gpg_signature_update_worker_spec.rb
+++ b/spec/workers/invalid_gpg_signature_update_worker_spec.rb
@@ -16,13 +16,6 @@ describe InvalidGpgSignatureUpdateWorker do
context 'when GpgKey is not found' do
let(:nonexisting_gpg_key_id) { -1 }
- it 'logs InvalidGpgSignatureUpdateWorker process skipping' do
- expect(Rails.logger).to receive(:error)
- .with("InvalidGpgSignatureUpdateWorker: couldn't find gpg_key with ID=-1, skipping job")
-
- described_class.new.perform(nonexisting_gpg_key_id)
- end
-
it 'does not raise errors' do
expect { described_class.new.perform(nonexisting_gpg_key_id) }.not_to raise_error
end