A platform for community discussion. Free, open, simple.
FIX: Don't let workflow trigger errors break core events (#44547)
Régis Hanolf171a6b5fe21
diff --git a/plugins/discourse-workflows/lib/discourse_workflows/event_listener.rb b/plugins/discourse-workflows/lib/discourse_workflows/event_listener.rbindex d3f6f314e9e..8bf874fa1d6 100644--- a/plugins/discourse-workflows/lib/discourse_workflows/event_listener.rb+++ b/plugins/discourse-workflows/lib/discourse_workflows/event_listener.rb@@ -14,13 +14,10 @@ module DiscourseWorkflowsWorkflowDependency.cached_published_triggers(trigger_class.identifier)- .select do |published_trigger|- trigger.matches?(- DiscourseWorkflows::TriggerNodeContext.from_published_trigger(published_trigger),- )- end.each do |published_trigger|- DiscourseWorkflows::TriggerDispatcher.enqueue(+ next if !trigger.matches?(TriggerNodeContext.from_published_trigger(published_trigger))++ TriggerDispatcher.enqueue(published_trigger,trigger_data: (trigger_data ||= trigger.output),user_id: user_id,@@ -31,6 +28,10 @@ module DiscourseWorkflows"for workflow #{published_trigger.workflow_id}: #{e.message}",)end+ rescue => e+ Rails.logger.error(+ "discourse-workflows: trigger #{trigger_class.identifier} failed: #{e.message}",+ )endendenddiff --git a/plugins/discourse-workflows/lib/discourse_workflows/nodes/post_edited/v1.rb b/plugins/discourse-workflows/lib/discourse_workflows/nodes/post_edited/v1.rbindex 77abcf356cb..c50f449bea0 100644--- a/plugins/discourse-workflows/lib/discourse_workflows/nodes/post_edited/v1.rb+++ b/plugins/discourse-workflows/lib/discourse_workflows/nodes/post_edited/v1.rb@@ -92,7 +92,7 @@ module DiscourseWorkflowsdef matches_trust_level?(trust_levels)trust_levels =Array.wrap(trust_levels).filter_map { |trust_level| trust_level.presence&.to_i }- trust_levels.empty? || trust_levels.include?(@post.user.trust_level)+ trust_levels.empty? || trust_levels.include?(@post.user&.trust_level)endendenddiff --git a/plugins/discourse-workflows/spec/lib/discourse_workflows/event_listener_spec.rb b/plugins/discourse-workflows/spec/lib/discourse_workflows/event_listener_spec.rbindex 1de216eaf69..5c2937ffdbc 100644--- a/plugins/discourse-workflows/spec/lib/discourse_workflows/event_listener_spec.rb+++ b/plugins/discourse-workflows/spec/lib/discourse_workflows/event_listener_spec.rb@@ -204,6 +204,32 @@ RSpec.describe DiscourseWorkflows::EventListener doexpect(enqueued_trigger_node_ids).to include("post-edited-trigger")end+ it "skips trust level filtered post edited workflows when the author is deleted" do+ post = create_post(user: Fabricate(:user, trust_level: TrustLevel[1]), category: category)+ post.update_columns(user_id: nil)+ create_published_workflow(+ "post-edited-trigger",+ "trigger:post_edited",+ configuration: {+ "trust_levels" => ["1"],+ },+ )++ expect {+ PostRevisor.new(post.reload).revise!(admin, raw: "Edited by admin")+ }.not_to raise_error+ expect(enqueued_trigger_node_ids).not_to include("post-edited-trigger")+ end++ it "logs instead of raising when a trigger fails to build" do+ create_published_workflow("post-edited-trigger", "trigger:post_edited")+ DiscourseWorkflows::Nodes::PostEdited::V1.stubs(:from_event).raises(StandardError, "boom")++ expect do+ described_class.handle(DiscourseWorkflows::Nodes::PostEdited::V1, Fabricate(:post))+ end.not_to raise_error+ end+it "does not enqueue post edited workflows when the revision skips workflows" dopost = create_post(user: Fabricate(:user, trust_level: TrustLevel[1]), category: category)create_published_workflow("post-edited-trigger", "trigger:post_edited")