Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Fixed: Webhooks: don't log as error messages a success (#12091)

Damian Legawiec95589338033a
diff --git a/api/app/services/spree/webhooks/subscribers/handle_request.rb b/api/app/services/spree/webhooks/subscribers/handle_request.rb
index 6d38e334e4..d4d849221a 100644
--- a/api/app/services/spree/webhooks/subscribers/handle_request.rb
+++ b/api/app/services/spree/webhooks/subscribers/handle_request.rb
@@ -19,7 +19,7 @@ module Spree
end
return process(:warn, msg("failed for '#{url}'")) if request.failed_request?
- process(:debug, msg("success for URL '#{url}'"))
+ process
end
private
@@ -30,8 +30,8 @@ module Spree
delegate :id, :url, to: :subscriber
delegate :created_at, :id, to: :event, prefix: true
- def process(log_level, msg)
- Rails.logger.public_send(log_level, msg)
+ def process(log_level = nil, msg = nil)
+ Rails.logger.public_send(log_level, msg) if msg.present? && log_level.present?
make_request
update_event(msg)
nil
@@ -59,7 +59,7 @@ module Spree
)
end
- def update_event(msg)
+ def update_event(msg = nil)
event.update(
execution_time: execution_time,
request_errors: msg,
diff --git a/api/spec/services/spree/webhooks/subscribers/handle_request_spec.rb b/api/spec/services/spree/webhooks/subscribers/handle_request_spec.rb
index 503ec3426c..62d909aed4 100644
--- a/api/spec/services/spree/webhooks/subscribers/handle_request_spec.rb
+++ b/api/spec/services/spree/webhooks/subscribers/handle_request_spec.rb
@@ -72,7 +72,7 @@ describe Spree::Webhooks::Subscribers::HandleRequest do
)
allow(Rails.logger).to receive(with_log_level)
subject.call
- expect(Rails.logger).to have_received(with_log_level).with(log_msg)
+ expect(Rails.logger).to have_received(with_log_level).with(log_msg) if log_msg
end
end
@@ -137,7 +137,7 @@ describe Spree::Webhooks::Subscribers::HandleRequest do
context 'without a failed request' do
let(:execution_time) { rand(1..999999) }
let(:failed_request) { false }
- let(:log_msg) { "[SPREE WEBHOOKS] 'order.canceled' success for URL 'http://google.com/'" }
+ let(:log_msg) { nil }
let(:response_code) { 200 }
let(:success) { true }