From 099b0ecb0029dd102b01efa02fb46ac255d28e1a Mon Sep 17 00:00:00 2001 From: HArsHA Ellanki Date: Mon, 21 Oct 2024 10:39:12 -0400 Subject: [PATCH 1/2] rails 7.1 deep merge fix --- lib/event_source.rb | 1 + lib/event_source/configure/config.rb | 2 +- lib/event_source/configure/servers.rb | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/event_source.rb b/lib/event_source.rb index 0956d8c6..09fb8514 100644 --- a/lib/event_source.rb +++ b/lib/event_source.rb @@ -11,6 +11,7 @@ require 'dry-struct' require 'oj' require 'active_support/all' # TODO: Remove ActiveSupport dependency +require 'deep_merge/rails_compat' require 'event_source/version' require 'event_source/ruby_versions' diff --git a/lib/event_source/configure/config.rb b/lib/event_source/configure/config.rb index 5c4423ce..6f74a670 100644 --- a/lib/event_source/configure/config.rb +++ b/lib/event_source/configure/config.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'deep_merge' +require 'deep_merge/rails_compat' module EventSource module Configure diff --git a/lib/event_source/configure/servers.rb b/lib/event_source/configure/servers.rb index 0f14a865..fa8847ec 100644 --- a/lib/event_source/configure/servers.rb +++ b/lib/event_source/configure/servers.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'deep_merge' +require 'deep_merge/rails_compat' module EventSource module Configure From 0dc56ca1c2b77d6f1b62259e62dd37b3b4eb269e Mon Sep 17 00:00:00 2001 From: Nisanth Yaganti Date: Thu, 15 May 2025 11:15:40 -0400 Subject: [PATCH 2/2] fixing unique key for http proxy to inline with executable container keys --- lib/event_source/protocols/http/faraday_queue_proxy.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/event_source/protocols/http/faraday_queue_proxy.rb b/lib/event_source/protocols/http/faraday_queue_proxy.rb index c1b76c4e..6489bd7a 100644 --- a/lib/event_source/protocols/http/faraday_queue_proxy.rb +++ b/lib/event_source/protocols/http/faraday_queue_proxy.rb @@ -49,7 +49,8 @@ def actions # @param [Object] subscriber_klass Subscriber class # @return [Queue] Queue instance def subscribe(subscriber_klass, _options) - unique_key = [app_name, formatted_exchange_name].join(delimiter) + subscriber_suffix = subscriber_klass.name.downcase.gsub('::', '_') + unique_key = [app_name, formatted_exchange_name].join(delimiter) + "_#{subscriber_suffix}" logger.debug "FaradayQueueProxy#register_subscription Subscriber Class #{subscriber_klass}" logger.debug "FaradayQueueProxy#register_subscription Unique_key #{unique_key}" executable = subscriber_klass.executable_for(unique_key)