action_subscriber 5.2.0-java → 5.2.4-java
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/action_subscriber.gemspec +1 -1
- data/lib/action_subscriber/babou.rb +4 -1
- data/lib/action_subscriber/bunny/subscriber.rb +3 -3
- data/lib/action_subscriber/configuration.rb +11 -2
- data/lib/action_subscriber/march_hare/subscriber.rb +3 -3
- data/lib/action_subscriber/rabbit_connection.rb +23 -0
- data/lib/action_subscriber/subscriber.rb +18 -0
- data/lib/action_subscriber/version.rb +1 -1
- data/lib/action_subscriber.rb +13 -0
- data/spec/integration/automatic_reconnect_spec.rb +28 -28
- data/spec/integration/consumer_cancellation_spec.rb +112 -72
- data/spec/lib/action_subscriber/configuration_spec.rb +7 -0
- data/spec/lib/action_subscriber/rabbit_connection_spec.rb +63 -0
- data/spec/spec_helper.rb +8 -0
- metadata +20 -18
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: b3c149733cfa1c38c096b3e1c9b69662c707d4fc1ead5285f62c3ff95589cf63
|
4
|
+
data.tar.gz: 46ad0ff7ab7ccd891f91376d25fe203c0bedac121ec438210d51c232af8e83b2
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: b8525aae6c072fd7411b54cebef73631acdebfd910fa644d488ef8e11031532fe64748172c180874defc27e711773dc9fbf9e958ab58ca96d795ddb9d154ae92
|
7
|
+
data.tar.gz: f5cd2b516b63013eb6697caa94abe6f0394012dd9e7e8e1426ef8f70d38bdef2bfbd57abb760dfc7385cbade43cb5f49dd3c894aae5a5bb633942d9f12e4686f
|
data/action_subscriber.gemspec
CHANGED
@@ -33,9 +33,9 @@ Gem::Specification.new do |spec|
|
|
33
33
|
spec.add_development_dependency "active_publisher", "~> 0.1.5"
|
34
34
|
spec.add_development_dependency "activerecord", ">= 3.2"
|
35
35
|
spec.add_development_dependency "bundler", ">= 1.6"
|
36
|
-
spec.add_development_dependency "pry-coolline"
|
37
36
|
spec.add_development_dependency "pry-nav"
|
38
37
|
spec.add_development_dependency "rabbitmq_http_api_client", "~> 1.2.0"
|
39
38
|
spec.add_development_dependency "rspec", "~> 3.0"
|
40
39
|
spec.add_development_dependency "rake"
|
40
|
+
spec.add_development_dependency "simplecov"
|
41
41
|
end
|
@@ -1,3 +1,5 @@
|
|
1
|
+
require "active_support/notifications"
|
2
|
+
|
1
3
|
module ActionSubscriber
|
2
4
|
module Babou
|
3
5
|
##
|
@@ -10,7 +12,7 @@ module ActionSubscriber
|
|
10
12
|
::ActionSubscriber.print_subscriptions
|
11
13
|
::ActionSubscriber.start_subscribers!
|
12
14
|
logger.info "Action Subscriber connected"
|
13
|
-
|
15
|
+
::ActiveSupport::Notifications.instrument("action_subscriber:server_started")
|
14
16
|
while true
|
15
17
|
sleep 1.0 #just hang around waiting for messages
|
16
18
|
break if shutting_down?
|
@@ -21,6 +23,7 @@ module ActionSubscriber
|
|
21
23
|
logger.info "Shutting down"
|
22
24
|
::ActionSubscriber::RabbitConnection.subscriber_disconnect!
|
23
25
|
logger.info "Shutdown complete"
|
26
|
+
::ActiveSupport::Notifications.instrument("action_subscriber:server_stopped")
|
24
27
|
exit(0)
|
25
28
|
end
|
26
29
|
|
@@ -2,6 +2,7 @@ module ActionSubscriber
|
|
2
2
|
module Bunny
|
3
3
|
module Subscriber
|
4
4
|
include ::ActionSubscriber::Logging
|
5
|
+
include ::ActionSubscriber::Subscriber
|
5
6
|
|
6
7
|
def bunny_consumers
|
7
8
|
@bunny_consumers ||= []
|
@@ -43,11 +44,10 @@ module ActionSubscriber
|
|
43
44
|
if ::ActionSubscriber.configuration.resubscribe_on_consumer_cancellation
|
44
45
|
# Add cancellation callback to rebuild subscriber on cancel.
|
45
46
|
consumer.on_cancellation do
|
46
|
-
::ActionSubscriber.logger.warn "
|
47
|
+
::ActionSubscriber.logger.warn "Cancellation received for queue consumer: #{queue.name}, rebuilding subscription..."
|
47
48
|
bunny_consumers.delete(consumer)
|
48
49
|
channel.close
|
49
|
-
|
50
|
-
start_subscriber_for_subscription(subscription)
|
50
|
+
safely_restart_subscriber(subscription)
|
51
51
|
end
|
52
52
|
end
|
53
53
|
|
@@ -77,8 +77,8 @@ module ActionSubscriber
|
|
77
77
|
end
|
78
78
|
|
79
79
|
::ActionSubscriber::Configuration::DEFAULTS.each_pair do |key, value|
|
80
|
-
setting =
|
81
|
-
::ActionSubscriber.config.__send__("#{key}=", setting) if
|
80
|
+
exists, setting = fetch_config_value(key, cli_options, yaml_config)
|
81
|
+
::ActionSubscriber.config.__send__("#{key}=", setting) if exists
|
82
82
|
end
|
83
83
|
|
84
84
|
true
|
@@ -86,6 +86,15 @@ module ActionSubscriber
|
|
86
86
|
end
|
87
87
|
end
|
88
88
|
|
89
|
+
def self.fetch_config_value(key, cli_options, yaml_config)
|
90
|
+
return [true, cli_options[key]] if cli_options.key?(key)
|
91
|
+
return [true, cli_options[key.to_s]] if cli_options.key?(key.to_s)
|
92
|
+
return [true, yaml_config[key]] if yaml_config.key?(key)
|
93
|
+
return [true, yaml_config[key.to_s]] if yaml_config.key?(key.to_s)
|
94
|
+
[false, nil]
|
95
|
+
end
|
96
|
+
private_class_method :fetch_config_value
|
97
|
+
|
89
98
|
##
|
90
99
|
# Instance Methods
|
91
100
|
#
|
@@ -2,6 +2,7 @@ module ActionSubscriber
|
|
2
2
|
module MarchHare
|
3
3
|
module Subscriber
|
4
4
|
include ::ActionSubscriber::Logging
|
5
|
+
include ::ActionSubscriber::Subscriber
|
5
6
|
|
6
7
|
def cancel_consumers!
|
7
8
|
# Cancel any non-cancelled consumers.
|
@@ -43,11 +44,10 @@ module ActionSubscriber
|
|
43
44
|
if ::ActionSubscriber.configuration.resubscribe_on_consumer_cancellation
|
44
45
|
# Add cancellation callback to rebuild subscriber on cancel.
|
45
46
|
opts[:on_cancellation] = lambda do |the_consumer|
|
46
|
-
::ActionSubscriber.logger.warn "
|
47
|
+
::ActionSubscriber.logger.warn "Cancellation received for queue consumer: #{queue.name}, rebuilding subscription..."
|
47
48
|
march_hare_consumers.delete(the_consumer)
|
48
49
|
queue.channel.close
|
49
|
-
|
50
|
-
start_subscriber_for_subscription(subscription)
|
50
|
+
safely_restart_subscriber(subscription)
|
51
51
|
end
|
52
52
|
end
|
53
53
|
|
@@ -30,9 +30,22 @@ module ActionSubscriber
|
|
30
30
|
::MarchHare::ThreadPools.fixed_of_size(options[:threadpool_size])
|
31
31
|
end
|
32
32
|
connection = ::MarchHare.connect(options)
|
33
|
+
connection.on_blocked do |reason|
|
34
|
+
on_blocked(reason)
|
35
|
+
end
|
36
|
+
connection.on_unblocked do
|
37
|
+
on_unblocked
|
38
|
+
end
|
39
|
+
connection
|
33
40
|
else
|
34
41
|
connection = ::Bunny.new(options)
|
35
42
|
connection.start
|
43
|
+
connection.on_blocked do |blocked_message|
|
44
|
+
on_blocked(blocked_message.reason)
|
45
|
+
end
|
46
|
+
connection.on_unblocked do
|
47
|
+
on_unblocked
|
48
|
+
end
|
36
49
|
connection
|
37
50
|
end
|
38
51
|
end
|
@@ -59,5 +72,15 @@ module ActionSubscriber
|
|
59
72
|
}
|
60
73
|
end
|
61
74
|
private_class_method :connection_options
|
75
|
+
|
76
|
+
def self.on_blocked(reason)
|
77
|
+
::ActiveSupport::Notifications.instrument("connection_blocked.action_subscriber", :reason => reason)
|
78
|
+
end
|
79
|
+
private_class_method :on_blocked
|
80
|
+
|
81
|
+
def self.on_unblocked
|
82
|
+
::ActiveSupport::Notifications.instrument("connection_unblocked.action_subscriber")
|
83
|
+
end
|
84
|
+
private_class_method :on_unblocked
|
62
85
|
end
|
63
86
|
end
|
@@ -0,0 +1,18 @@
|
|
1
|
+
module ActionSubscriber
|
2
|
+
module Subscriber
|
3
|
+
# resubscribes to queue, continuously retrying to subscribe in the event of a potentially recoverable error while
|
4
|
+
# also calling the error handler to surface that a subscription failure happened
|
5
|
+
def safely_restart_subscriber(subscription)
|
6
|
+
subscription[:queue] = setup_queue(subscription[:route])
|
7
|
+
start_subscriber_for_subscription(subscription)
|
8
|
+
rescue StandardError => e
|
9
|
+
::ActionSubscriber.configuration.error_handler.call(e)
|
10
|
+
raise e unless e.message =~ /queue .* process is stopped by supervisor/
|
11
|
+
|
12
|
+
nap_time = rand(2.0..5.0)
|
13
|
+
::ActionSubscriber.logger.error("Failed to resubscribe to #{subscription[:queue].name}, retrying again in #{nap_time} seconds...")
|
14
|
+
sleep(nap_time)
|
15
|
+
retry
|
16
|
+
end
|
17
|
+
end
|
18
|
+
end
|
data/lib/action_subscriber.rb
CHANGED
@@ -21,6 +21,7 @@ require "action_subscriber/message_retry"
|
|
21
21
|
require "action_subscriber/middleware"
|
22
22
|
require "action_subscriber/rabbit_connection"
|
23
23
|
require "action_subscriber/subscribable"
|
24
|
+
require "action_subscriber/subscriber"
|
24
25
|
require "action_subscriber/thread_pools"
|
25
26
|
require "action_subscriber/bunny/subscriber"
|
26
27
|
require "action_subscriber/march_hare/subscriber"
|
@@ -86,6 +87,18 @@ module ActionSubscriber
|
|
86
87
|
route_set.wait_to_finish_with_timeout(timeout)
|
87
88
|
end
|
88
89
|
|
90
|
+
def self.after_server_start(&block)
|
91
|
+
::ActiveSupport::Notifications.subscribe("action_subscriber:server_started") do |*args|
|
92
|
+
block.call(*args)
|
93
|
+
end
|
94
|
+
end
|
95
|
+
|
96
|
+
def self.after_server_stop(&block)
|
97
|
+
::ActiveSupport::Notifications.subscribe("action_subscriber:server_stopped") do |*args|
|
98
|
+
block.call(*args)
|
99
|
+
end
|
100
|
+
end
|
101
|
+
|
89
102
|
# Execution is delayed until after app loads when used with bin/action_subscriber
|
90
103
|
require "action_subscriber/railtie" if defined?(Rails)
|
91
104
|
::ActiveSupport.run_load_hooks(:action_subscriber, Base)
|
@@ -7,36 +7,36 @@ class GusSubscriber < ActionSubscriber::Base
|
|
7
7
|
end
|
8
8
|
|
9
9
|
describe "Automatically reconnect on connection failure", :integration => true, :slow => true do
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
10
|
+
let(:draw_routes) do
|
11
|
+
::ActionSubscriber.draw_routes do
|
12
|
+
default_routes_for GusSubscriber
|
13
|
+
end
|
14
|
+
end
|
15
|
+
let(:http_client) { RabbitMQ::HTTP::Client.new("http://127.0.0.1:15672") }
|
16
|
+
let(:subscriber) { GusSubscriber }
|
17
17
|
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
18
|
+
it "reconnects when a connection drops" do
|
19
|
+
::ActionSubscriber::start_subscribers!
|
20
|
+
::ActivePublisher.publish("gus.spoke", "First", "events")
|
21
|
+
verify_expectation_within(5.0) do
|
22
|
+
expect($messages).to eq(Set.new(["First"]))
|
23
|
+
end
|
24
24
|
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
25
|
+
close_all_connections!
|
26
|
+
sleep 5.0
|
27
|
+
verify_expectation_within(5.0) do
|
28
|
+
expect(::ActionSubscriber::RabbitConnection.with_connection{|connection| connection.open?}).to eq(true)
|
29
|
+
end
|
30
30
|
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
31
|
+
::ActivePublisher.publish("gus.spoke", "Second", "events")
|
32
|
+
verify_expectation_within(5.0) do
|
33
|
+
expect($messages).to eq(Set.new(["First", "Second"]))
|
34
|
+
end
|
35
|
+
end
|
36
36
|
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
37
|
+
def close_all_connections!
|
38
|
+
http_client.list_connections.each do |conn_info|
|
39
|
+
http_client.close_connection(conn_info.name)
|
40
|
+
end
|
41
|
+
end
|
42
42
|
end
|
@@ -8,76 +8,116 @@ class YoloSubscriber < ActionSubscriber::Base
|
|
8
8
|
end
|
9
9
|
|
10
10
|
describe "Automatically handles consumer cancellation", :integration => true, :slow => true do
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
11
|
+
let(:draw_routes) do
|
12
|
+
::ActionSubscriber.draw_routes do
|
13
|
+
default_routes_for ::YoloSubscriber
|
14
|
+
end
|
15
|
+
end
|
16
|
+
let(:http_client) { ::RabbitMQ::HTTP::Client.new("http://127.0.0.1:15672") }
|
17
|
+
let(:subscriber) { ::YoloSubscriber }
|
18
|
+
|
19
|
+
it "resubscribes on cancellation" do
|
20
|
+
::ActionSubscriber::start_subscribers!
|
21
|
+
::ActivePublisher.publish("yolo.created", "First", "events")
|
22
|
+
verify_expectation_within(5.0) do
|
23
|
+
expect($messages).to eq(::Set.new(["First"]))
|
24
|
+
end
|
25
|
+
|
26
|
+
consumers = rabbit_consumers.dup
|
27
|
+
|
28
|
+
# Signal a cancellation event to all subscribers.
|
29
|
+
delete_all_queues!
|
30
|
+
|
31
|
+
# Give consumers a chance to restart.
|
32
|
+
sleep 2.0
|
33
|
+
|
34
|
+
expect(rabbit_consumers).to_not eq(consumers)
|
35
|
+
|
36
|
+
::ActivePublisher.publish("yolo.created", "Second", "events")
|
37
|
+
verify_expectation_within(5.0) do
|
38
|
+
expect($messages).to eq(Set.new(["First", "Second"]))
|
39
|
+
end
|
40
|
+
end
|
41
|
+
|
42
|
+
context "when resubscribe on consumer cancellation is disabled" do
|
43
|
+
before do
|
44
|
+
allow(::ActionSubscriber.configuration).to receive(:resubscribe_on_consumer_cancellation).and_return(false)
|
45
|
+
end
|
46
|
+
|
47
|
+
it "does not resubscribe on cancellation" do
|
48
|
+
::ActionSubscriber::start_subscribers!
|
49
|
+
::ActivePublisher.publish("yolo.created", "First", "events")
|
50
|
+
verify_expectation_within(5.0) do
|
51
|
+
expect($messages).to eq(::Set.new(["First"]))
|
52
|
+
end
|
53
|
+
|
54
|
+
consumers = rabbit_consumers.dup
|
55
|
+
|
56
|
+
# Signal a cancellation event to all subscribers.
|
57
|
+
delete_all_queues!
|
58
|
+
|
59
|
+
# Give consumers a chance to restart.
|
60
|
+
sleep 2.0
|
61
|
+
|
62
|
+
# Verify the consumers did not change.
|
63
|
+
expect(rabbit_consumers).to eq(consumers)
|
64
|
+
|
65
|
+
::ActivePublisher.publish("yolo.created", "Second", "events")
|
66
|
+
|
67
|
+
# Force sleep 2 seconds to ensure a resubscribe did not happen and messages were not processed.
|
68
|
+
sleep 2.0
|
69
|
+
expect($messages).to eq(Set.new(["First"]))
|
70
|
+
end
|
71
|
+
end
|
72
|
+
|
73
|
+
describe "resubscription logic" do
|
74
|
+
let(:subscription) { subject.send(:subscriptions).first }
|
75
|
+
subject { ::ActionSubscriber.send(:route_set) }
|
76
|
+
|
77
|
+
it "sets up consumers" do
|
78
|
+
if ::RUBY_PLATFORM == "java"
|
79
|
+
expect { subject.safely_restart_subscriber(subscription) }.to change { subject.march_hare_consumers.count }.from(0).to(1)
|
80
|
+
else
|
81
|
+
expect { subject.safely_restart_subscriber(subscription) }.to change { subject.bunny_consumers.count }.from(0).to(1)
|
82
|
+
end
|
83
|
+
end
|
84
|
+
|
85
|
+
context "when error is raised during resubscription process" do
|
86
|
+
context "and error is one that can be retried" do
|
87
|
+
let(:error) { ::RuntimeError.new("queue 're.created' in vhost '/' process is stopped by supervisor") }
|
88
|
+
|
89
|
+
it "retries resubscription process" do
|
90
|
+
expect(subject).to receive(:setup_queue).and_raise(error).ordered
|
91
|
+
expect(subject).to receive(:setup_queue).and_raise(error).ordered
|
92
|
+
expect(subject).to receive(:setup_queue).and_call_original.ordered
|
93
|
+
expect(::ActionSubscriber.config.error_handler).to receive(:call).with(error).twice
|
94
|
+
expect(::ActionSubscriber.logger).to receive(:error).twice
|
95
|
+
expect(subject).to receive(:sleep).twice # mostly to skip the delay
|
96
|
+
subject.safely_restart_subscriber(subscription)
|
97
|
+
end
|
98
|
+
end
|
99
|
+
|
100
|
+
context "and error is one that can't be retried" do
|
101
|
+
let(:error) { ::RuntimeError.new("kaBOOM") }
|
102
|
+
|
103
|
+
it "calls error handler and raises" do
|
104
|
+
expect(subject).to receive(:setup_queue).and_raise(error).ordered
|
105
|
+
expect(::ActionSubscriber.config.error_handler).to receive(:call).with(error).once
|
106
|
+
expect(subject).to_not receive(:sleep)
|
107
|
+
expect { subject.safely_restart_subscriber(subscription) }.to raise_error(error)
|
108
|
+
end
|
109
|
+
end
|
110
|
+
end
|
111
|
+
end
|
112
|
+
|
113
|
+
def rabbit_consumers
|
114
|
+
route_set = ::ActionSubscriber.send(:route_set)
|
115
|
+
route_set.try(:bunny_consumers) || route_set.try(:march_hare_consumers)
|
116
|
+
end
|
117
|
+
|
118
|
+
def delete_all_queues!
|
119
|
+
http_client.list_queues.each do |queue|
|
120
|
+
http_client.delete_queue(queue.vhost, queue.name)
|
121
|
+
end
|
122
|
+
end
|
83
123
|
end
|
@@ -24,6 +24,13 @@ describe ::ActionSubscriber::Configuration do
|
|
24
24
|
::ActionSubscriber::Configuration.configure_from_yaml_and_cli({}, true)
|
25
25
|
end
|
26
26
|
end
|
27
|
+
|
28
|
+
it "can override a true value with a false value" do
|
29
|
+
expect(::ActionSubscriber.configuration.verify_peer).to eq(true)
|
30
|
+
expect(::ActionSubscriber.configuration).to receive(:verify_peer=).with(false).and_call_original
|
31
|
+
::ActionSubscriber::Configuration.configure_from_yaml_and_cli({"verify_peer" => false}, true)
|
32
|
+
expect(::ActionSubscriber.configuration.verify_peer).to eq(false)
|
33
|
+
end
|
27
34
|
end
|
28
35
|
|
29
36
|
describe "add_decoder" do
|
@@ -0,0 +1,63 @@
|
|
1
|
+
require "spec_helper"
|
2
|
+
|
3
|
+
describe ::ActionSubscriber::RabbitConnection do
|
4
|
+
let(:reason) { "low on disk" }
|
5
|
+
|
6
|
+
before { ActionSubscriber.draw_routes {} }
|
7
|
+
|
8
|
+
context "on_block" do
|
9
|
+
if ::RUBY_PLATFORM == "java"
|
10
|
+
def trigger_mocked_blocking_event(connection, reason)
|
11
|
+
amqp_message = ::Java::ComRabbitmqClient::AMQP::Connection::Blocked::Builder.new.
|
12
|
+
reason(reason).build
|
13
|
+
amq_command = ::Java::ComRabbitmqClientImpl::AMQCommand.new(amqp_message)
|
14
|
+
|
15
|
+
connection.send(:processControlCommand, amq_command)
|
16
|
+
end
|
17
|
+
else
|
18
|
+
def trigger_mocked_blocking_event(connection, reason)
|
19
|
+
connection.send(:handle_frame, 0, ::AMQ::Protocol::Connection::Blocked.new(reason))
|
20
|
+
end
|
21
|
+
end
|
22
|
+
|
23
|
+
it "can deliver an on_blocked message" do
|
24
|
+
expect(::ActiveSupport::Notifications).to receive(:instrument).
|
25
|
+
with("connection_blocked.action_subscriber", :reason => reason)
|
26
|
+
|
27
|
+
described_class.with_connection do |connection|
|
28
|
+
# NOTE: Trigger the receiving of a blocked message from the broker.
|
29
|
+
# It's a bit of a hack but it is a more realistic test without changing
|
30
|
+
# memory alarms.
|
31
|
+
trigger_mocked_blocking_event(connection, reason)
|
32
|
+
end
|
33
|
+
end
|
34
|
+
end
|
35
|
+
|
36
|
+
context "on_unblocked" do
|
37
|
+
if ::RUBY_PLATFORM == "java"
|
38
|
+
def trigger_mocked_unblocked_event(connection, reason)
|
39
|
+
amqp_message = ::Java::ComRabbitmqClient::AMQP::Connection::Unblocked::Builder.new.
|
40
|
+
build
|
41
|
+
amq_command = ::Java::ComRabbitmqClientImpl::AMQCommand.new(amqp_message)
|
42
|
+
|
43
|
+
connection.send(:processControlCommand, amq_command)
|
44
|
+
end
|
45
|
+
else
|
46
|
+
def trigger_mocked_unblocked_event(connection, reason)
|
47
|
+
connection.send(:handle_frame, 0, ::AMQ::Protocol::Connection::Unblocked.new)
|
48
|
+
end
|
49
|
+
end
|
50
|
+
|
51
|
+
it "can deliver an on_unblocked message" do
|
52
|
+
expect(::ActiveSupport::Notifications).to receive(:instrument).
|
53
|
+
with("connection_unblocked.action_subscriber")
|
54
|
+
|
55
|
+
described_class.with_connection do |connection|
|
56
|
+
# NOTE: Trigger the receiving of an unblocked message from the broker.
|
57
|
+
# It's a bit of a hack but it is a more realistic test without changing
|
58
|
+
# memory alarms.
|
59
|
+
trigger_mocked_unblocked_event(connection, reason)
|
60
|
+
end
|
61
|
+
end
|
62
|
+
end
|
63
|
+
end
|
data/spec/spec_helper.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: action_subscriber
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 5.2.
|
4
|
+
version: 5.2.4
|
5
5
|
platform: java
|
6
6
|
authors:
|
7
7
|
- Brian Stien
|
@@ -12,7 +12,7 @@ authors:
|
|
12
12
|
autorequire:
|
13
13
|
bindir: bin
|
14
14
|
cert_chain: []
|
15
|
-
date:
|
15
|
+
date: 2022-01-06 00:00:00.000000000 Z
|
16
16
|
dependencies:
|
17
17
|
- !ruby/object:Gem::Dependency
|
18
18
|
requirement: !ruby/object:Gem::Requirement
|
@@ -126,20 +126,6 @@ dependencies:
|
|
126
126
|
- - ">="
|
127
127
|
- !ruby/object:Gem::Version
|
128
128
|
version: '1.6'
|
129
|
-
- !ruby/object:Gem::Dependency
|
130
|
-
requirement: !ruby/object:Gem::Requirement
|
131
|
-
requirements:
|
132
|
-
- - ">="
|
133
|
-
- !ruby/object:Gem::Version
|
134
|
-
version: '0'
|
135
|
-
name: pry-coolline
|
136
|
-
prerelease: false
|
137
|
-
type: :development
|
138
|
-
version_requirements: !ruby/object:Gem::Requirement
|
139
|
-
requirements:
|
140
|
-
- - ">="
|
141
|
-
- !ruby/object:Gem::Version
|
142
|
-
version: '0'
|
143
129
|
- !ruby/object:Gem::Dependency
|
144
130
|
requirement: !ruby/object:Gem::Requirement
|
145
131
|
requirements:
|
@@ -196,6 +182,20 @@ dependencies:
|
|
196
182
|
- - ">="
|
197
183
|
- !ruby/object:Gem::Version
|
198
184
|
version: '0'
|
185
|
+
- !ruby/object:Gem::Dependency
|
186
|
+
requirement: !ruby/object:Gem::Requirement
|
187
|
+
requirements:
|
188
|
+
- - ">="
|
189
|
+
- !ruby/object:Gem::Version
|
190
|
+
version: '0'
|
191
|
+
name: simplecov
|
192
|
+
prerelease: false
|
193
|
+
type: :development
|
194
|
+
version_requirements: !ruby/object:Gem::Requirement
|
195
|
+
requirements:
|
196
|
+
- - ">="
|
197
|
+
- !ruby/object:Gem::Version
|
198
|
+
version: '0'
|
199
199
|
description: ActionSubscriber is a DSL that allows a rails app to consume messages
|
200
200
|
from a RabbitMQ broker.
|
201
201
|
email:
|
@@ -249,6 +249,7 @@ files:
|
|
249
249
|
- lib/action_subscriber/router.rb
|
250
250
|
- lib/action_subscriber/rspec.rb
|
251
251
|
- lib/action_subscriber/subscribable.rb
|
252
|
+
- lib/action_subscriber/subscriber.rb
|
252
253
|
- lib/action_subscriber/thread_pools.rb
|
253
254
|
- lib/action_subscriber/uri.rb
|
254
255
|
- lib/action_subscriber/version.rb
|
@@ -273,6 +274,7 @@ files:
|
|
273
274
|
- spec/lib/action_subscriber/middleware/error_handler_spec.rb
|
274
275
|
- spec/lib/action_subscriber/middleware/router_spec.rb
|
275
276
|
- spec/lib/action_subscriber/middleware/runner_spec.rb
|
277
|
+
- spec/lib/action_subscriber/rabbit_connection_spec.rb
|
276
278
|
- spec/lib/action_subscriber/router_spec.rb
|
277
279
|
- spec/lib/action_subscriber/subscribable_spec.rb
|
278
280
|
- spec/spec_helper.rb
|
@@ -297,8 +299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
297
299
|
- !ruby/object:Gem::Version
|
298
300
|
version: '0'
|
299
301
|
requirements: []
|
300
|
-
|
301
|
-
rubygems_version: 2.7.9
|
302
|
+
rubygems_version: 3.2.28
|
302
303
|
signing_key:
|
303
304
|
specification_version: 4
|
304
305
|
summary: ActionSubscriber is a DSL that allows a rails app to consume messages from
|
@@ -324,6 +325,7 @@ test_files:
|
|
324
325
|
- spec/lib/action_subscriber/middleware/error_handler_spec.rb
|
325
326
|
- spec/lib/action_subscriber/middleware/router_spec.rb
|
326
327
|
- spec/lib/action_subscriber/middleware/runner_spec.rb
|
328
|
+
- spec/lib/action_subscriber/rabbit_connection_spec.rb
|
327
329
|
- spec/lib/action_subscriber/router_spec.rb
|
328
330
|
- spec/lib/action_subscriber/subscribable_spec.rb
|
329
331
|
- spec/spec_helper.rb
|