fluentd 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fef23fb6e94b2100154a4ef1618ad628435118b13fc9c1f6884e69ecc221368
-  data.tar.gz: 6d1eb5b941ce9df4987fcf19f0345d46965534d858205ed07c71c67e7b8c2966
+  metadata.gz: faae0c0f8e371e91fb6cf69bbe368546910282f29d2a447d6aa79eb9ed006913
+  data.tar.gz: 0a28223bc8471c15756a49ad89aac13456dc8ae9b7f31364043db86f95d76213
 SHA512:
-  metadata.gz: b426456c884540d5bd9aafbd0c7e3f5dec5a64db50ce631a09a93d2dfee1adeff8f96f051ffc4702ac464ea91d05a485866838f0ea383380d397a3073363da67
-  data.tar.gz: 34791ef0f1498fc68e27935ed3d9f1393d1aaa28f39ee1718f679f5aef2c8c0094301d49edbde5b793651a8226efe7f070ab4f422dffe7da2a6bc833f297cf6a
+  metadata.gz: d21f537df92d813568d963c8f49775f187013a804a8be59e39e8f2e6cf970de28236bb133d3f2071dba73d73e56f172d233a263b756615f1543d4c1994a2e6f8
+  data.tar.gz: 042fa8d384f3698ae556f66eefce7f718c132ad63edd16ecab0a9bbc989d3a0497dfd4b9fe7ad5246519cec78a8f9ed51e05967ac8db01b08f7e541eb7d2b2e7

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # v1.6
 
+## Release v1.6.2 - 2019/07/11
+
+### Bug fixes
+
+* http_server helper: Add title argument to support multiple servers
+  https://github.com/fluent/fluentd/pull/2493
+
 ## Release v1.6.1 - 2019/07/10
 
 ### Enhancement

data/lib/fluent/plugin/in_monitor_agent.rb

@@ -208,7 +208,7 @@ module Fluent::Plugin
 
       log.debug "listening monitoring http server on http://#{@bind}:#{@port}/api/plugins for worker#{fluentd_worker_id}"
       api_handler = APIHandler.new(self)
-      create_http_server(addr: @bind, port: @port, logger: log, default_app: NotFoundJson) do |serv|
+      create_http_server(:in_monitor_http_server_helper, addr: @bind, port: @port, logger: log, default_app: NotFoundJson) do |serv|
         serv.get('/api/plugins') { |req| api_handler.plugins_ltsv(req) }
         serv.get('/api/plugins.json') { |req| api_handler.plugins_json(req) }
         serv.get('/api/config') { |req| api_handler.config_ltsv(req) }

data/lib/fluent/plugin_helper/http_server.rb

@@ -34,11 +34,12 @@ module Fluent
       # close    : correct stopped threads
       # terminate: kill thread
 
+      # @param title [Symbol] the thread name. this value should be unique.
       # @param addr [String] Listen address
       # @param port [String] Listen port
       # @param logger [Logger] logger used in this server
       # @param default_app [Object] This method must have #call.
-      def create_http_server(addr:, port:, logger:, default_app: nil)
+      def create_http_server(title, addr:, port:, logger:, default_app: nil)
         unless block_given?
           raise ArgumentError, 'BUG: callback not specified'
         end
@@ -48,7 +49,7 @@ module Fluent
         end
 
         _block_until_http_server_start do |notify|
-          thread_create(:plugin_helper_http_server) do
+          thread_create(title) do
             @_http_server.start(notify)
           end
         end

data/lib/fluent/version.rb

@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '1.6.1'
+  VERSION = '1.6.2'
 
 end

data/test/plugin_helper/test_http_server_helper.rb

@@ -50,7 +50,8 @@ class HtttpHelperTest < Test::Unit::TestCase
   %w[get head].each do |n|
     define_method(n) do |uri, header = {}|
       url = URI.parse(uri)
-      req = Net::HTTP.const_get(n.capitalize).new(url, header)
+      headers = { 'Content-Type' => 'application/x-www-form-urlencoded/' }.merge(header)
+      req = Net::HTTP.const_get(n.capitalize).new(url, headers)
       Net::HTTP.start(url.host, url.port) do |http|
         http.request(req)
       end
@@ -60,7 +61,8 @@ class HtttpHelperTest < Test::Unit::TestCase
   %w[post put patch delete options trace].each do |n|
     define_method(n) do |uri, body = '', header = {}|
       url = URI.parse(uri)
-      req = Net::HTTP.const_get(n.capitalize).new(url, header)
+      headers = { 'Content-Type' => 'application/x-www-form-urlencoded/' }.merge(header)
+      req = Net::HTTP.const_get(n.capitalize).new(url, headers)
       req.body = body
       Net::HTTP.start(url.host, url.port) do |http|
         http.request(req)
@@ -71,7 +73,7 @@ class HtttpHelperTest < Test::Unit::TestCase
   sub_test_case 'Create a HTTP server' do
     test 'monunt given path' do
       on_driver do |driver|
-        driver.create_http_server(addr: '127.0.0.1', port: PORT, logger: NULL_LOGGER) do |s|
+        driver.create_http_server(:http_server_helper_test, addr: '127.0.0.1', port: PORT, logger: NULL_LOGGER) do |s|
           s.get('/example/hello') { [200, { 'Content-Type' => 'text/plain' }, 'hello get'] }
           s.post('/example/hello') { [200, { 'Content-Type' => 'text/plain' }, 'hello post'] }
           s.head('/example/hello') { [200, { 'Content-Type' => 'text/plain' }, 'hello head'] }
@@ -106,7 +108,7 @@ class HtttpHelperTest < Test::Unit::TestCase
 
     test 'when path does not start with `/` or ends with `/`' do
       on_driver do |driver|
-        driver.create_http_server(addr: '127.0.0.1', port: PORT, logger: NULL_LOGGER) do |s|
+        driver.create_http_server(:http_server_helper_test, addr: '127.0.0.1', port: PORT, logger: NULL_LOGGER) do |s|
           s.get('example/hello') { [200, { 'Content-Type' => 'text/plain' }, 'hello get'] }
           s.get('/example/hello2/') { [200, { 'Content-Type' => 'text/plain' }, 'hello get'] }
         end
@@ -121,7 +123,7 @@ class HtttpHelperTest < Test::Unit::TestCase
 
     test 'when error raised' do
       on_driver do |driver|
-        driver.create_http_server(addr: '127.0.0.1', port: PORT, logger: NULL_LOGGER) do |s|
+        driver.create_http_server(:http_server_helper_test, addr: '127.0.0.1', port: PORT, logger: NULL_LOGGER) do |s|
           s.get('/example/hello') { raise 'error!' }
         end
 
@@ -132,7 +134,7 @@ class HtttpHelperTest < Test::Unit::TestCase
 
     test 'when path is not found' do
       on_driver do |driver|
-        driver.create_http_server(addr: '127.0.0.1', port: PORT, logger: NULL_LOGGER) do |s|
+        driver.create_http_server(:http_server_helper_test, addr: '127.0.0.1', port: PORT, logger: NULL_LOGGER) do |s|
           s.get('/example/hello') { [200, { 'Content-Type' => 'text/plain' }, 'hello get'] }
         end
 
@@ -143,7 +145,7 @@ class HtttpHelperTest < Test::Unit::TestCase
 
     test 'params and body' do
       on_driver do |driver|
-        driver.create_http_server(addr: '127.0.0.1', port: PORT, logger: NULL_LOGGER) do |s|
+        driver.create_http_server(:http_server_helper_test, addr: '127.0.0.1', port: PORT, logger: NULL_LOGGER) do |s|
           s.get('/example/hello') do |req|
             assert_equal(req.query_string, nil)
             assert_equal(req.body, nil)
@@ -193,7 +195,7 @@ class HtttpHelperTest < Test::Unit::TestCase
         end
 
         stub(Fluent::PluginHelper::HttpServer::Server).new(anything) { server }
-        driver.create_http_server(addr: '127.0.0.1', port: PORT, logger: NULL_LOGGER) do
+        driver.create_http_server(:http_server_helper_test, addr: '127.0.0.1', port: PORT, logger: NULL_LOGGER) do
           # nothing
         end
         driver.stop

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-11 00:00:00.000000000 Z
+date: 2019-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack