Skip to content

Commit ba5b206

Browse files
authored
server: remove codes for async v1.x (#4771)
**Which issue(s) this PR fixes**: Fixes # **What this PR does / why we need it**: Async v2.0 just supports Ruby 3.1 or above. When we had been supporting Ruby 2.7 and 3.0, we need async v1.x and v2.x both. Related to #4619 Next fluentd version will drop support of Ruby 3.1 or below. So, now we can remove the codes for async v1.x Ref. #4745 **Docs Changes**: **Release Note**: Signed-off-by: Shizuo Fujita <[email protected]>
1 parent b58c3f0 commit ba5b206

File tree

2 files changed

+5
-15
lines changed

2 files changed

+5
-15
lines changed

Diff for: fluentd.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Gem::Specification.new do |gem|
6565
gem.add_development_dependency("test-unit", ["~> 3.3"])
6666
gem.add_development_dependency("test-unit-rr", ["~> 1.0"])
6767
gem.add_development_dependency("oj", [">= 2.14", "< 4"])
68-
gem.add_development_dependency("async-http", ">= 0.50.0")
68+
gem.add_development_dependency("async-http", "~> 0.86")
6969
gem.add_development_dependency("aws-sigv4", ["~> 1.8"])
7070
gem.add_development_dependency("aws-sdk-core", ["~> 3.191"])
7171
gem.add_development_dependency("rexml", ["~> 3.2"])

Diff for: lib/fluent/plugin_helper/http_server/server.rb

+4-14
Original file line numberDiff line numberDiff line change
@@ -68,23 +68,17 @@ def start(notify = nil)
6868
notify.push(:ready)
6969
end
7070

71-
if async_v2?
72-
@server_task_queue = ::Thread::Queue.new
73-
@server_task_queue.pop
74-
@server_task&.stop
75-
end
71+
@server_task_queue = ::Thread::Queue.new
72+
@server_task_queue.pop
73+
@server_task&.stop
7674
end
7775

7876
@logger.debug('Finished HTTP server')
7977
end
8078

8179
def stop
8280
@logger.debug('closing HTTP server')
83-
if async_v2?
84-
@server_task_queue&.push(:stop)
85-
else
86-
@server_task&.stop
87-
end
81+
@server_task_queue.push(:stop)
8882
end
8983

9084
HttpServer::Methods::ALL.map { |e| e.downcase.to_sym }.each do |name|
@@ -100,10 +94,6 @@ def stop
10094
@router.mount(name, path, app || block)
10195
end
10296
end
103-
104-
private def async_v2?
105-
Gem::Version.new(Async::VERSION) >= Gem::Version.new('2.0')
106-
end
10797
end
10898
end
10999
end

0 commit comments

Comments
 (0)