Skip to content

Commit 83c19d1

Browse files
authored
http_server: stop fallback to WEBrick (#4899)
**Which issue(s) this PR fixes**: * Partially Fixes #4648 **What this PR does / why we need it**: Make `http_server` plugin helper stop the fallback to WEBrick. WEBrick is no longer recommended for production use. We don't need this feature because it was for supporting Ruby < 2.3. (#2447) **Docs Changes**: https://docs.fluentd.org/plugin-helper-overview/api-plugin-helper-http_server => fluent/fluentd-docs-gitbook#575 **Release Note**: The same as the title. Signed-off-by: Daijiro Fukuda <[email protected]>
1 parent e445acf commit 83c19d1

File tree

5 files changed

+2
-211
lines changed

5 files changed

+2
-211
lines changed

fluentd.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ Gem::Specification.new do |gem|
3535
gem.add_runtime_dependency("webrick", ["~> 1.4"])
3636
gem.add_runtime_dependency("zstd-ruby", ["~> 1.5"])
3737
gem.add_runtime_dependency("uri", '~> 1.0')
38+
gem.add_runtime_dependency("async-http", "~> 0.86")
3839

3940
# gems that aren't default gems as of Ruby 3.4
4041
gem.add_runtime_dependency("base64", ["~> 0.2"])
@@ -68,7 +69,6 @@ Gem::Specification.new do |gem|
6869
gem.add_development_dependency("test-unit", ["~> 3.3"])
6970
gem.add_development_dependency("test-unit-rr", ["~> 1.0"])
7071
gem.add_development_dependency("oj", [">= 2.14", "< 4"])
71-
gem.add_development_dependency("async-http", "~> 0.86")
7272
gem.add_development_dependency("console", "~> 1.30")
7373
gem.add_development_dependency("aws-sigv4", ["~> 1.8"])
7474
gem.add_development_dependency("aws-sdk-core", ["~> 3.191"])

lib/fluent/plugin_helper/http_server.rb

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,9 @@
1414
# limitations under the License.
1515
#
1616

17-
begin
18-
require 'async'
19-
require 'fluent/plugin_helper/http_server/server'
20-
rescue LoadError => _
21-
require 'fluent/plugin_helper/http_server/compat/server'
22-
Fluent::PluginHelper::HttpServer::Server = Fluent::PluginHelper::HttpServer::Compat::Server
23-
end
24-
2517
require 'fluent/plugin_helper/thread'
2618
require 'fluent/plugin_helper/server' # For Server::ServerTransportParams
19+
require 'fluent/plugin_helper/http_server/server'
2720
require 'fluent/plugin_helper/http_server/ssl_context_builder'
2821

2922
module Fluent

lib/fluent/plugin_helper/http_server/compat/server.rb

Lines changed: 0 additions & 92 deletions
This file was deleted.

lib/fluent/plugin_helper/http_server/compat/ssl_context_extractor.rb

Lines changed: 0 additions & 52 deletions
This file was deleted.

lib/fluent/plugin_helper/http_server/compat/webrick_handler.rb

Lines changed: 0 additions & 58 deletions
This file was deleted.

0 commit comments

Comments
 (0)