Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ Gem::Specification.new do |gem|
gem.add_runtime_dependency("webrick", ["~> 1.4"])
gem.add_runtime_dependency("zstd-ruby", ["~> 1.5"])
gem.add_runtime_dependency("uri", '~> 1.0')
gem.add_runtime_dependency("async-http", "~> 0.86")

# gems that aren't default gems as of Ruby 3.4
gem.add_runtime_dependency("base64", ["~> 0.2"])
Expand Down Expand Up @@ -68,7 +69,6 @@ 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.86")
gem.add_development_dependency("console", "~> 1.30")
gem.add_development_dependency("aws-sigv4", ["~> 1.8"])
gem.add_development_dependency("aws-sdk-core", ["~> 3.191"])
Expand Down
9 changes: 1 addition & 8 deletions lib/fluent/plugin_helper/http_server.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,9 @@
# limitations under the License.
#

begin
require 'async'
require 'fluent/plugin_helper/http_server/server'
rescue LoadError => _
require 'fluent/plugin_helper/http_server/compat/server'
Fluent::PluginHelper::HttpServer::Server = Fluent::PluginHelper::HttpServer::Compat::Server
end

require 'fluent/plugin_helper/thread'
require 'fluent/plugin_helper/server' # For Server::ServerTransportParams
require 'fluent/plugin_helper/http_server/server'
require 'fluent/plugin_helper/http_server/ssl_context_builder'

module Fluent
Expand Down
92 changes: 0 additions & 92 deletions lib/fluent/plugin_helper/http_server/compat/server.rb

This file was deleted.

This file was deleted.

58 changes: 0 additions & 58 deletions lib/fluent/plugin_helper/http_server/compat/webrick_handler.rb

This file was deleted.