summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-02-26 16:57:10 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-02-26 16:57:10 +0200
commit3073f1aa6e8658825af739440f7288deeef9169d (patch)
treeced0db5a6f9b724af30ccf11b6c5ee23290509ba
parent4b998239a3fec56f93e24ca063d1196416aec938 (diff)
downloadgitlab-ce-3073f1aa6e8658825af739440f7288deeef9169d.tar.gz
Handle excpetion in PluginWorker
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/workers/plugin_worker.rb2
-rw-r--r--spec/workers/plugin_worker_spec.rb27
2 files changed, 29 insertions, 0 deletions
diff --git a/app/workers/plugin_worker.rb b/app/workers/plugin_worker.rb
index 34a3c8d62ac..cebdf8d0017 100644
--- a/app/workers/plugin_worker.rb
+++ b/app/workers/plugin_worker.rb
@@ -5,5 +5,7 @@ class PluginWorker
def perform(file_name, data)
Gitlab::Plugin.execute(file_name, data)
+ rescue => e
+ Rails.logger.error("#{self.class}: #{e.message}")
end
end
diff --git a/spec/workers/plugin_worker_spec.rb b/spec/workers/plugin_worker_spec.rb
new file mode 100644
index 00000000000..29c55482321
--- /dev/null
+++ b/spec/workers/plugin_worker_spec.rb
@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe PluginWorker do
+ include RepoHelpers
+
+ subject { described_class.new }
+
+ let(:filename) { 'my_plugin.rb' }
+
+ describe '#perform' do
+ it 'executes Gitlab::Plugin with expected values' do
+ data = { 'event_name' => 'project_create' }
+
+ allow(Gitlab::Plugin).to receive(:execute).with(filename, data).and_return(true)
+
+ expect(subject.perform(filename, data)).to be_truthy
+ end
+
+ it 'handles exception well' do
+ data = { 'event_name' => 'project_create' }
+
+ allow(Gitlab::Plugin).to receive(:execute).with(filename, data).and_raise('Permission denied')
+
+ expect { subject.perform(filename, data) }.to_not raise_error
+ end
+ end
+end