A platform for community discussion. Free, open, simple.
FIX: Isolate DiscourseEvent handlers so one error doesn't skip the rest (#38485)
Natalie Tay42c4619295a1
diff --git a/lib/discourse_event.rb b/lib/discourse_event.rbindex 49051462cfe..4c1aa9b3c64 100644--- a/lib/discourse_event.rb+++ b/lib/discourse_event.rb@@ -8,8 +8,13 @@ class DiscourseEvent@events ||= Hash.new { |hash, key| hash[key] = Set.new }end- def self.trigger(event_name, *args, **kwargs)- events[event_name].each { |event| event.call(*args, **kwargs) }+ def self.trigger(event_name, *args, continue_on_error: false, **kwargs)+ events[event_name].each do |event|+ event.call(*args, **kwargs)+ rescue => e+ raise unless continue_on_error+ Discourse.warn_exception(e, message: "on(:#{event_name}) handler error")+ endenddef self.on(event_name, &block)diff --git a/lib/post_creator.rb b/lib/post_creator.rbindex 43eb549e888..71c8ba5434b 100644--- a/lib/post_creator.rb+++ b/lib/post_creator.rb@@ -266,17 +266,10 @@ class PostCreatorenddef trigger_after_events- begin- DiscourseEvent.trigger(:topic_created, @post.topic, @opts, @user) unless @opts[:topic_id]- rescue => e- Discourse.warn_exception(e, message: "Error in 'topic_created' event handler")- end-- begin- DiscourseEvent.trigger(:post_created, @post, @opts, @user)- rescue => e- Discourse.warn_exception(e, message: "Error in 'post_created' event handler")+ unless @opts[:topic_id]+ DiscourseEvent.trigger(:topic_created, @post.topic, @opts, @user, continue_on_error: true)end+ DiscourseEvent.trigger(:post_created, @post, @opts, @user, continue_on_error: true)enddef self.track_post_statsdiff --git a/spec/lib/discourse_event_spec.rb b/spec/lib/discourse_event_spec.rbindex 33a9059fce4..b476011a535 100644--- a/spec/lib/discourse_event_spec.rb+++ b/spec/lib/discourse_event_spec.rb@@ -75,6 +75,29 @@ RSpec.describe DiscourseEvent doendend+ describe ".trigger with continue_on_error" do+ let(:sprigatito) { OpenStruct.new(name: "Sprigatito", type: "Grass") }++ it "continues executing subsequent handlers when one raises" do+ ditto_handler = Proc.new { |cat| cat.name = "Ditto" }+ meowth_handler = Proc.new { raise "Team Rocket blasting off again" }+ evolve_handler = Proc.new { |cat| cat.type = "Grass/Dark" }++ DiscourseEvent.on(:evolve, &ditto_handler)+ DiscourseEvent.on(:evolve, &meowth_handler)+ DiscourseEvent.on(:evolve, &evolve_handler)++ DiscourseEvent.trigger(:evolve, sprigatito, continue_on_error: true)++ expect(sprigatito.name).to eq("Ditto")+ expect(sprigatito.type).to eq("Grass/Dark")+ ensure+ DiscourseEvent.off(:evolve, &ditto_handler)+ DiscourseEvent.off(:evolve, &meowth_handler)+ DiscourseEvent.off(:evolve, &evolve_handler)+ end+ end+it "allows using kwargs" dobeginhandler =