Skip to content

server: remove codes for async v1.x #4771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daipom merged 1 commit into from
Jan 16, 2025
Merged

server: remove codes for async v1.x #4771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fluentd.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +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-http", ">= 0.50.0")
gem.add_development_dependency("async-http", "~> 0.86")
gem.add_development_dependency("aws-sigv4", ["~> 1.8"])
gem.add_development_dependency("aws-sdk-core", ["~> 3.191"])
gem.add_development_dependency("rexml", ["~> 3.2"])
Expand Down
18 changes: 4 additions & 14 deletions lib/fluent/plugin_helper/http_server/server.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,23 +68,17 @@ 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')
end

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|
Expand All @@ -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
Expand Down
Loading