YUKI Hiroshi
null+****@clear*****
Wed Apr 15 20:28:01 JST 2015
YUKI Hiroshi 2015-04-15 20:28:01 +0900 (Wed, 15 Apr 2015) New Revision: 657f780c5c371a5708a0cb8a905918985df25a45 https://github.com/droonga/drndump/commit/657f780c5c371a5708a0cb8a905918985df25a45 Message: Specify client options via options only for DumpClient#run Modified files: lib/drndump/command.rb lib/drndump/dump_client.rb Modified: lib/drndump/command.rb (+5 -5) =================================================================== --- lib/drndump/command.rb 2015-04-15 20:21:47 +0900 (50a0046) +++ lib/drndump/command.rb 2015-04-15 20:28:01 +0900 (12d005d) @@ -113,16 +113,16 @@ module Drndump :dataset => @dataset, :receiver_host => @receiver_host, :receiver_port => @receiver_port, - :client_options => { - :backend => :coolio, - :loop => @loop, - }, } end def dump @dumper = DumpClient.new(dumper_params) - @dumper.run do |message| + dump_options => { + :backend => :coolio, + :loop => @loop, + } + @dumper.run(dump_options) do |message| puts(JSON.pretty_generate(message)) end @loop.run Modified: lib/drndump/dump_client.rb (+4 -3) =================================================================== --- lib/drndump/dump_client.rb 2015-04-15 20:21:47 +0900 (def3c3c) +++ lib/drndump/dump_client.rb 2015-04-15 20:28:01 +0900 (ea3206a) @@ -43,8 +43,6 @@ module Drndump @receiver_host = params[:receiver_host] @receiver_port = params[:receiver_port] - @client_options = params[:client_options] - @error_message = nil @on_finish = nil @@ -53,7 +51,10 @@ module Drndump end def run(options={}, &block) - extra_client_options = options[:client_options] || @client_options || {} + extra_client_options = { + :backend => options[:baclend], + :loop => options[:loop], + } client = Droonga::Client.new(client_options.merge(extra_client_options)) client.on_error = lambda do |error| on_error(ClientError.new(error)) -------------- next part -------------- HTML����������������������������...下载
