Kouhei Sutou
null+****@clear*****
Thu Jul 17 23:15:05 JST 2014
Kouhei Sutou 2014-07-17 23:15:05 +0900 (Thu, 17 Jul 2014) New Revision: f053ee3ec682c73f6a0e542fed19466dc69f002d https://github.com/droonga/droonga-engine/commit/f053ee3ec682c73f6a0e542fed19466dc69f002d Message: Remove needless reserve API Modified files: lib/droonga/buffered_tcp_socket.rb lib/droonga/fluent_message_sender.rb lib/droonga/forwarder.rb Modified: lib/droonga/buffered_tcp_socket.rb (+1 -6) =================================================================== --- lib/droonga/buffered_tcp_socket.rb 2014-07-17 22:25:36 +0900 (25865c1) +++ lib/droonga/buffered_tcp_socket.rb 2014-07-17 23:15:05 +0900 (ba9a513) @@ -34,15 +34,10 @@ module Droonga end def write(data) - reserve_write(data) - schedule_write - data.bytesize - end - - def reserve_write(data) chunk = Chunk.new(@data_directory, data, Time.now, 0) chunk.buffering @_write_buffer << chunk + schedule_write data.bytesize end Modified: lib/droonga/fluent_message_sender.rb (+0 -8) =================================================================== --- lib/droonga/fluent_message_sender.rb 2014-07-17 22:25:36 +0900 (a124b70) +++ lib/droonga/fluent_message_sender.rb 2014-07-17 23:15:05 +0900 (d4903ba) @@ -55,14 +55,6 @@ module Droonga logger.trace("send: done") end - def reserve_send(tag, data) - logger.trace("reserve_send: start") - packed_fluent_message = create_packed_fluent_message(tag, data) - connect unless connected? - @socket.reserve_write(packed_fluent_message) - logger.trace("reserve_send: done") - end - def resume connect @socket.resume Modified: lib/droonga/forwarder.rb (+2 -7) =================================================================== --- lib/droonga/forwarder.rb 2014-07-17 22:25:36 +0900 (bda4bff) +++ lib/droonga/forwarder.rb 2014-07-17 23:15:05 +0900 (74a6bac) @@ -47,8 +47,7 @@ module Droonga command = destination["type"] receiver = destination["to"] arguments = destination["arguments"] - reserve = destination["reserve"] - output(receiver, message, command, arguments, :reserve => reserve) + output(receiver, message, command, arguments) logger.trace("forward: done") end @@ -104,11 +103,7 @@ module Droonga output_tag = "#{tag}.message" log_info = "<#{receiver}>:<#{output_tag}>" logger.trace("output: post: start: #{log_info}") - if options[:reserve] - sender.reserve_send(output_tag, message) - else - sender.send(output_tag, message) - end + sender.send(output_tag, message) logger.trace("output: post: done: #{log_info}") logger.trace("output: done") end -------------- next part -------------- HTML����������������������������...Download