Daijiro MORI
null+****@clear*****
Wed Sep 4 19:46:11 JST 2013
Daijiro MORI 2013-09-04 19:46:11 +0900 (Wed, 04 Sep 2013) New Revision: 5a93befb1c3c33304329bd262cce0b49f4b3eba7 https://github.com/droonga/fluent-plugin-droonga/commit/5a93befb1c3c33304329bd262cce0b49f4b3eba7 Message: Disable proxy by default. Modified files: lib/droonga/engine.rb lib/droonga/proxy.rb lib/fluent/plugin/out_droonga.rb Modified: lib/droonga/engine.rb (+1 -1) =================================================================== --- lib/droonga/engine.rb 2013-09-03 20:01:10 +0900 (c3e6d30) +++ lib/droonga/engine.rb 2013-09-04 19:46:11 +0900 (129dd80) @@ -52,7 +52,7 @@ module Droonga start_emitter else @executor = Executor.new(@options) - @executor.add_handler("proxy_message") if @options[:name] + @executor.add_handler("proxy_message") if @options[:proxy] end end Modified: lib/droonga/proxy.rb (+2 -1) =================================================================== --- lib/droonga/proxy.rb 2013-09-03 20:01:10 +0900 (51f9a2e) +++ lib/droonga/proxy.rb 2013-09-04 19:46:11 +0900 (1dcd21d) @@ -24,7 +24,8 @@ module Droonga def initialize(worker, name) @engines = {} Droonga::catalog.get_engines(name).each do |name, options| - engine = Droonga::Engine.new(options.merge({:with_server => false})) + engine = Droonga::Engine.new(options.merge(:proxy => false, + :with_server => false)) engine.start @engines[name] = engine end Modified: lib/fluent/plugin/out_droonga.rb (+3 -1) =================================================================== --- lib/fluent/plugin/out_droonga.rb 2013-09-03 20:01:10 +0900 (84f08ea) +++ lib/fluent/plugin/out_droonga.rb 2013-09-04 19:46:11 +0900 (7036581) @@ -22,6 +22,7 @@ module Fluent Plugin.register_output("droonga", self) config_param :name, :string, :default => "" + config_param :proxy, :bool, :default => false config_param :n_workers, :integer, :default => 1 config_param :database, :string, :default => "" config_param :queue_name, :string, :default => "DroongaQueue" @@ -35,7 +36,8 @@ module Fluent :queue_name => @queue_name, :n_workers => @n_workers, :handlers => @handlers, - :name => @name) + :name => @name, + :proxy => @proxy) @engine.start end -------------- next part -------------- HTML����������������������������...Download