mirror of
https://github.com/ditkrg/rabbit_carrots.git
synced 2026-01-22 22:06:40 +00:00
fix: Ensure message payloads are UTF-8 encoded before logging and update gem version.
This commit is contained in:
parent
c673d7e5a1
commit
0a0ef429c0
@ -92,19 +92,24 @@ module RabbitCarrots
|
|||||||
handler_class.handle!(channel, delivery_info, properties, payload)
|
handler_class.handle!(channel, delivery_info, properties, payload)
|
||||||
channel.ack(delivery_info.delivery_tag, false)
|
channel.ack(delivery_info.delivery_tag, false)
|
||||||
rescue RabbitCarrots::EventHandlers::Errors::NackMessage, JSON::ParserError => _e
|
rescue RabbitCarrots::EventHandlers::Errors::NackMessage, JSON::ParserError => _e
|
||||||
|
payload = encode_payload(payload)
|
||||||
logger.warn "Nacked message: #{payload}"
|
logger.warn "Nacked message: #{payload}"
|
||||||
channel.nack(delivery_info.delivery_tag, false, false)
|
channel.nack(delivery_info.delivery_tag, false, false)
|
||||||
rescue RabbitCarrots::EventHandlers::Errors::NackAndRequeueMessage => _e
|
rescue RabbitCarrots::EventHandlers::Errors::NackAndRequeueMessage => _e
|
||||||
|
payload = encode_payload(payload)
|
||||||
logger.warn "Nacked and Requeued message: #{payload}"
|
logger.warn "Nacked and Requeued message: #{payload}"
|
||||||
channel.nack(delivery_info.delivery_tag, false, true)
|
channel.nack(delivery_info.delivery_tag, false, true)
|
||||||
rescue self.class.database_agnostic_not_null_violation, self.class.database_agnostic_record_invalid => e
|
rescue self.class.database_agnostic_not_null_violation, self.class.database_agnostic_record_invalid => e
|
||||||
|
payload = encode_payload(payload)
|
||||||
logger.warn "Null constraint or Invalid violation: #{payload}. Error: #{e.message}"
|
logger.warn "Null constraint or Invalid violation: #{payload}. Error: #{e.message}"
|
||||||
channel.ack(delivery_info.delivery_tag, false)
|
channel.ack(delivery_info.delivery_tag, false)
|
||||||
rescue self.class.database_agnostic_connection_not_established => e
|
rescue self.class.database_agnostic_connection_not_established => e
|
||||||
|
payload = encode_payload(payload)
|
||||||
logger.warn "Error connection not established to the database: #{payload}. Error: #{e.message}"
|
logger.warn "Error connection not established to the database: #{payload}. Error: #{e.message}"
|
||||||
sleep 3
|
sleep 3
|
||||||
channel.nack(delivery_info.delivery_tag, false, true)
|
channel.nack(delivery_info.delivery_tag, false, true)
|
||||||
rescue StandardError => e
|
rescue StandardError => e
|
||||||
|
payload = encode_payload(payload)
|
||||||
logger.error "Error handling message: #{payload}. Error: #{e.message}"
|
logger.error "Error handling message: #{payload}. Error: #{e.message}"
|
||||||
sleep 3
|
sleep 3
|
||||||
channel.nack(delivery_info.delivery_tag, false, true)
|
channel.nack(delivery_info.delivery_tag, false, true)
|
||||||
@ -137,5 +142,14 @@ module RabbitCarrots
|
|||||||
adapter.instance_variable_set(:@logger, logger)
|
adapter.instance_variable_set(:@logger, logger)
|
||||||
adapter
|
adapter
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def encode_payload(payload)
|
||||||
|
payload.encode(
|
||||||
|
'UTF-8',
|
||||||
|
invalid: :replace,
|
||||||
|
undef: :replace,
|
||||||
|
replace: ''
|
||||||
|
)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
module RabbitCarrots
|
module RabbitCarrots
|
||||||
VERSION = '1.0.5'
|
VERSION = '1.0.6'
|
||||||
end
|
end
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user