Skip to content

Commit ab5421d

Browse files
Merge pull request #124 from cookpad/r/remove-shutdown
Update producers shutdown call
2 parents 45eaf82 + 9f1b170 commit ab5421d

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

.github/workflows/ci.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@ jobs:
88
matrix:
99
ruby:
1010
- 'head'
11+
- '3.2'
1112
- '3.1'
1213
- '3.0'
13-
- '2.7'
1414
continue-on-error: ${{ matrix.ruby == 'head' }}
1515
name: Ruby ${{ matrix.ruby }}
16-
1716
steps:
1817
- uses: actions/checkout@v2
1918
- uses: ruby/setup-ruby@v1

lib/streamy/message_buses/kafka_message_bus.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ def deliver(key:, topic:, payload:, priority:)
2424
end
2525

2626
def shutdown
27-
async_producer.shutdown if async_producer?
28-
sync_producers.map(&:shutdown)
27+
async_producer.close if async_producer?
28+
sync_producers.map(&:close)
2929
end
3030

3131
private
@@ -48,7 +48,7 @@ def async_producer
4848
end
4949

5050
def async_producer?
51-
@_async_producer.present?
51+
!!@_async_producer
5252
end
5353

5454
def sync_producer

streamy.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
3535
spec.add_development_dependency "capybara"
3636
spec.add_development_dependency "minitest", "~> 5.0"
3737
spec.add_development_dependency "minitest-focus"
38-
spec.add_development_dependency "mocha", "~> 1.4"
38+
spec.add_development_dependency "mocha", "~> 2.0"
3939
spec.add_development_dependency "pry", "~> 0.11"
4040
spec.add_development_dependency "rake", ">= 12.3.3"
4141
spec.add_development_dependency "rspec"

test/message_buses/kafka_message_bus_test.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -146,15 +146,15 @@ def test_config_overrides
146146
def test_sync_producer_shutdown
147147
example_delivery(:essential)
148148

149-
producer.expects(:shutdown)
149+
producer.expects(:close)
150150

151151
bus.shutdown
152152
end
153153

154154
def test_async_producer_shutdown
155155
example_delivery(:standard)
156156

157-
producer.expects(:shutdown)
157+
producer.expects(:close)
158158

159159
bus.shutdown
160160
end

0 commit comments

Comments
 (0)