Kouhei Sutou
null+****@clear*****
Thu Jan 30 18:05:52 JST 2014
Kouhei Sutou 2014-01-30 18:05:52 +0900 (Thu, 30 Jan 2014) New Revision: 5f40d99c0b38b154ebed8f2ca7f6df00c3fdea2d https://github.com/droonga/fluent-plugin-droonga/commit/5f40d99c0b38b154ebed8f2ca7f6df00c3fdea2d Message: Use "output_adapter.plugins" in catalog.json for output adapter Modified files: lib/droonga/dispatcher.rb lib/droonga/output_adapter.rb sample/cluster/catalog.json test/command/config/default/catalog.json Modified: lib/droonga/dispatcher.rb (+2 -2) =================================================================== --- lib/droonga/dispatcher.rb 2014-01-30 18:02:18 +0900 (73199c3) +++ lib/droonga/dispatcher.rb 2014-01-30 18:05:52 +0900 (27878b4) @@ -1,4 +1,4 @@ -# Copyright (C) 2013 Droonga Project +# Copyright (C) 2013-2014 Droonga Project # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -55,7 +55,7 @@ module Droonga @input_adapter = InputAdapter.new(self, Droonga.catalog.input_adapter_options) @output_adapter = - OutputAdapter.new(self, :plugins => Droonga.catalog.option("plugins")) + OutputAdapter.new(self, Droonga.catalog.output_adapter_options) @farm = Farm.new(name, @loop, :dispatcher => self) @forwarder = Forwarder.new(@loop) @replier = Replier.new(@forwarder) Modified: lib/droonga/output_adapter.rb (+4 -2) =================================================================== --- lib/droonga/output_adapter.rb 2014-01-30 18:02:18 +0900 (5a11596) +++ lib/droonga/output_adapter.rb 2014-01-30 18:05:52 +0900 (7e132f5) @@ -17,15 +17,17 @@ require "droonga/pluggable" require "droonga/output_adapter_plugin" +require "droonga/output_adapter_options" require "droonga/output_message" module Droonga class OutputAdapter include Pluggable - def initialize(dispatcher, options={}) + def initialize(dispatcher, options=nil) @dispatcher = dispatcher - load_plugins(options[:plugins] || []) + @options = options || OutputAdapterOptions + load_plugins(@options.plugins) end def adapt(message) Modified: sample/cluster/catalog.json (+2 -2) =================================================================== --- sample/cluster/catalog.json 2014-01-30 18:02:18 +0900 (6cc1954) +++ sample/cluster/catalog.json 2014-01-30 18:05:52 +0900 (252603b) @@ -38,10 +38,10 @@ } } }, - "options": { + "input_adapter": { "plugins": ["groonga"] }, - "input_adapter": { + "output_adapter": { "plugins": ["groonga"] } } Modified: test/command/config/default/catalog.json (+2 -2) =================================================================== --- test/command/config/default/catalog.json 2014-01-30 18:02:18 +0900 (eb671c3) +++ test/command/config/default/catalog.json 2014-01-30 18:05:52 +0900 (17b0153) @@ -55,10 +55,10 @@ } } }, - "options": { + "input_adapter": { "plugins": ["crud", "groonga"] }, - "input_adapter": { + "output_adapter": { "plugins": ["crud", "groonga"] } } -------------- next part -------------- HTML����������������������������...Download