From 2b23c160bf606ad1819b5ba5fd5319926f259dd6 Mon Sep 17 00:00:00 2001 From: Shizuo Fujita Date: Wed, 15 Jan 2025 16:23:29 +0900 Subject: [PATCH] server: remove codes for async v1.x Signed-off-by: Shizuo Fujita --- fluentd.gemspec | 1 + lib/fluent/plugin_helper/http_server/server.rb | 18 ++++-------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/fluentd.gemspec b/fluentd.gemspec index 9888878b57..1d79e42b05 100644 --- a/fluentd.gemspec +++ b/fluentd.gemspec @@ -65,6 +65,7 @@ Gem::Specification.new do |gem| gem.add_development_dependency("test-unit", ["~> 3.3"]) gem.add_development_dependency("test-unit-rr", ["~> 1.0"]) gem.add_development_dependency("oj", [">= 2.14", "< 4"]) + gem.add_development_dependency("async", ">= 2.0") gem.add_development_dependency("async-http", ">= 0.50.0") gem.add_development_dependency("aws-sigv4", ["~> 1.8"]) gem.add_development_dependency("aws-sdk-core", ["~> 3.191"]) diff --git a/lib/fluent/plugin_helper/http_server/server.rb b/lib/fluent/plugin_helper/http_server/server.rb index 50df177e83..9c099292d8 100644 --- a/lib/fluent/plugin_helper/http_server/server.rb +++ b/lib/fluent/plugin_helper/http_server/server.rb @@ -68,11 +68,9 @@ def start(notify = nil) notify.push(:ready) end - if async_v2? - @server_task_queue = ::Thread::Queue.new - @server_task_queue.pop - @server_task&.stop - end + @server_task_queue = ::Thread::Queue.new + @server_task_queue.pop + @server_task&.stop end @logger.debug('Finished HTTP server') @@ -80,11 +78,7 @@ def start(notify = nil) def stop @logger.debug('closing HTTP server') - if async_v2? - @server_task_queue&.push(:stop) - else - @server_task&.stop - end + @server_task_queue.push(:stop) end HttpServer::Methods::ALL.map { |e| e.downcase.to_sym }.each do |name| @@ -100,10 +94,6 @@ def stop @router.mount(name, path, app || block) end end - - private def async_v2? - Gem::Version.new(Async::VERSION) >= Gem::Version.new('2.0') - end end end end