YUKI Hiroshi
null+****@clear*****
Thu Apr 23 17:58:28 JST 2015
YUKI Hiroshi 2015-04-23 17:58:28 +0900 (Thu, 23 Apr 2015) New Revision: 2e3b97953ea70c1bc62ae3a4d18c6545b33625c2 https://github.com/droonga/droonga-engine/commit/2e3b97953ea70c1bc62ae3a4d18c6545b33625c2 Message: Simplify Modified files: lib/droonga/engine_node.rb lib/droonga/fluent_message_sender.rb lib/droonga/job_pusher.rb lib/droonga/job_receiver.rb lib/droonga/process_supervisor.rb lib/droonga/serf/agent.rb lib/droonga/session.rb Modified: lib/droonga/engine_node.rb (+1 -4) =================================================================== --- lib/droonga/engine_node.rb 2015-04-23 17:50:57 +0900 (9614df5) +++ lib/droonga/engine_node.rb 2015-04-23 17:58:28 +0900 (7599425) @@ -274,7 +274,7 @@ module Droonga previous_timer.detach if previous_timer @auto_close_timer = Coolio::TimerWatcher.new(@auto_close_timeout) - on_timeout = lambda do + @auto_close_timer.on_timer do @auto_close_timer.detach @auto_close_timer = nil if @sender @@ -283,9 +283,6 @@ module Droonga @sender = nil end end - @auto_close_timer.on_timer do - on_timeout.call - end @loop.attach(@auto_close_timer) end Modified: lib/droonga/fluent_message_sender.rb (+6 -19) =================================================================== --- lib/droonga/fluent_message_sender.rb 2015-04-23 17:50:57 +0900 (3e5073a) +++ lib/droonga/fluent_message_sender.rb 2015-04-23 17:58:28 +0900 (7e8c9d5) @@ -75,21 +75,6 @@ module Droonga def connect logger.trace("connect: start") - log_write_complete = lambda do - logger.trace("write completed") - end - log_connect = lambda do - logger.trace("connected") - end - log_failed = lambda do - logger.error("failed to connect") - @socket = nil - end - on_close = lambda do - logger.trace("connection is closed by someone") - @socket = nil - end - if @buffering data_directory = Path.accidental_buffer + "#{target_node}" FileUtils.mkdir_p(data_directory.to_s) @@ -99,16 +84,18 @@ module Droonga @socket = Coolio::TCPSocket.connect(@host, @port) end @socket.on_write_complete do - log_write_complete.call + logger.trace("write completed") end @socket.on_connect do - log_connect.call + logger.trace("connected") end @socket.on_connect_failed do - log_failed.call + logger.error("failed to connect") + @socket = nil end @socket.on_close do - on_close.call + logger.trace("connection is closed by someone") + @socket = nil end @loop.attach(@socket) # logger.trace("connect: new socket watcher attached", Modified: lib/droonga/job_pusher.rb (+1 -4) =================================================================== --- lib/droonga/job_pusher.rb 2015-04-23 17:50:57 +0900 (12da93c) +++ lib/droonga/job_pusher.rb 2015-04-23 17:58:28 +0900 (9669d2b) @@ -184,13 +184,10 @@ module Droonga private def setup_connection - on_read = lambda do |data| + @connection.on_read do |data| @ready = (data == JobProtocol::READY_SIGNAL) @on_ready.call(self) if @on_ready end - @connection.on_read do |data| - on_read.call(data) - end end end end Modified: lib/droonga/job_receiver.rb (+1 -4) =================================================================== --- lib/droonga/job_receiver.rb 2015-04-23 17:50:57 +0900 (121f114) +++ lib/droonga/job_receiver.rb 2015-04-23 17:58:28 +0900 (067d1bb) @@ -50,7 +50,7 @@ module Droonga private def setup_receive_handler(connection) unpacker = MessagePack::Unpacker.new - on_read = lambda do |data| + connection.on_read do |data| logger.trace("on_read: start") unpacker.feed_each(data) do |message| @callback.call(message) @@ -58,9 +58,6 @@ module Droonga logger.trace("on_read: done") send_ready(connection) end - connection.on_read do |data| - on_read.call(data) - end send_ready(connection) end Modified: lib/droonga/process_supervisor.rb (+1 -4) =================================================================== --- lib/droonga/process_supervisor.rb 2015-04-23 17:50:57 +0900 (f021ade) +++ lib/droonga/process_supervisor.rb 2015-04-23 17:58:28 +0900 (e15c8fd) @@ -80,7 +80,7 @@ module Droonga def create_input(raw_input) input = Coolio::IO.new(raw_input) line_buffer = LineBuffer.new - on_read = lambda do |data| + input.on_read do |data| line_buffer.feed(data) do |line| case line when Messages::READY @@ -90,9 +90,6 @@ module Droonga end end end - input.on_read do |data| - on_read.call(data) - end input end Modified: lib/droonga/serf/agent.rb (+2 -8) =================================================================== --- lib/droonga/serf/agent.rb 2015-04-23 17:50:57 +0900 (b6fa653) +++ lib/droonga/serf/agent.rb 2015-04-23 17:58:28 +0900 (81cd670) @@ -107,24 +107,18 @@ module Droonga end output_line_buffer = LineBuffer.new - on_read_output = lambda do |data| - on_standard_output(output_line_buffer, data) - end @output_io = Coolio::IO.new(output_read) @output_io.on_read do |data| - on_read_output.call(data) + on_standard_output(output_line_buffer, data) end @loop.attach(@output_io) # logger.trace("capture_output: new output_io watcher attached", # :watcher => @output_io) error_line_buffer = LineBuffer.new - on_read_error = lambda do |data| - on_error_output(error_line_buffer, data) - end @error_io = Coolio::IO.new(error_read) @error_io.on_read do |data| - on_read_error.call(data) + on_error_output(error_line_buffer, data) end @loop.attach(@error_io) # logger.trace("capture_output: new error_io watcher attached", Modified: lib/droonga/session.rb (+3 -6) =================================================================== --- lib/droonga/session.rb 2015-04-23 17:50:57 +0900 (400fd89) +++ lib/droonga/session.rb 2015-04-23 17:58:28 +0900 (8f6eac6) @@ -115,16 +115,13 @@ module Droonga end end - def set_timeout(loop, timeout, &on_timeout) + def set_timeout(loop, timeout, &block) @timeout_timer = Coolio::TimerWatcher.new(timeout) - on_timer = lambda do + @timeout_timer.on_timer do @timeout_timer.detach @timeout_timer = nil report_timeout_error - on_timeout.call - end - @timeout_timer.on_timer do - on_timer.call + yield end loop.attach(@timeout_timer) end -------------- next part -------------- HTML����������������������������...Download