YUKI Hiroshi
null+****@clear*****
Thu Apr 23 17:22:35 JST 2015
YUKI Hiroshi 2015-04-23 17:22:35 +0900 (Thu, 23 Apr 2015) New Revision: 1951c710d48bbf02f72570e03d6dde1efdd48f9a https://github.com/droonga/droonga-engine/commit/1951c710d48bbf02f72570e03d6dde1efdd48f9a Message: Report watchers to the log Modified files: lib/droonga/command/droonga_engine.rb lib/droonga/file_observer.rb lib/droonga/fluent_message_receiver.rb lib/droonga/job_pusher.rb lib/droonga/job_receiver.rb lib/droonga/plugins/dump.rb lib/droonga/plugins/system/absorb_data.rb lib/droonga/process_supervisor.rb lib/droonga/serf/agent.rb lib/droonga/worker_process_agent.rb Modified: lib/droonga/command/droonga_engine.rb (+3 -5) =================================================================== --- lib/droonga/command/droonga_engine.rb 2015-04-23 17:01:43 +0900 (0ab57d3) +++ lib/droonga/command/droonga_engine.rb 2015-04-23 17:22:35 +0900 (9b997a3) @@ -758,7 +758,7 @@ module Droonga def start logger.trace("start: stert") @async_watcher = Coolio::AsyncWatcher.new - on_signal = lambda do + @async_watcher.on_signal do commands =****@comma***** @commands.clear until commands.empty? @@ -766,11 +766,9 @@ module Droonga @on_command.call(command) if @on_command end end - @async_watcher.on_signal do - on_signal.call - end @loop.attach(@async_watcher) - # logger.trace("start: new watcher attached", :watcher => @async_watcher) + logger.trace("start: async watcher attached", + :watcher => @async_watcher) logger.trace("start: done") end Modified: lib/droonga/file_observer.rb (+6 -6) =================================================================== --- lib/droonga/file_observer.rb 2015-04-23 17:01:43 +0900 (df46455) +++ lib/droonga/file_observer.rb 2015-04-23 17:22:35 +0900 (b41b9bf) @@ -47,16 +47,16 @@ module Droonga end end @loop.attach(@timer) - # logger.trace("start: new file watcher attached", - # :watcher => @timer, - # :path => @path) + logger.trace("start: timer attached", + :watcher => @timer, + :path => @path) end def stop @timer.detach if @timer - # logger.trace("stop: file watcher detached", - # :watcher => @timer, - # :path => @path) + logger.trace("stop: timer detached", + :watcher => @timer, + :path => @path) @timer = nil end Modified: lib/droonga/fluent_message_receiver.rb (+12 -12) =================================================================== --- lib/droonga/fluent_message_receiver.rb 2015-04-23 17:01:43 +0900 (2df0d38) +++ lib/droonga/fluent_message_receiver.rb 2015-04-23 17:22:35 +0900 (7e8801b) @@ -114,10 +114,10 @@ module Droonga @clients << client end @loop.attach(@server) - # logger.trace("start_server: new server watcher attached", - # :watcher => @server, - # :listen_fd => @listen_fd, - # :heartbeat_fd => @heartbeat_fd) + logger.trace("start_server: server watcher attached", + :watcher => @server, + :listen_fd => @listen_fd, + :heartbeat_fd => @heartbeat_fd) logger.trace("start_server: done") end @@ -129,8 +129,8 @@ module Droonga def shutdown_server logger.trace("shutdown_server: start") @server.close - # logger.trace("shutdown_server: server watcher detached", - # :watcher => @server) + logger.trace("shutdown_server: server watcher detached", + :watcher => @server) logger.trace("shutdown_server: done") end @@ -154,17 +154,17 @@ module Droonga receive_heartbeat end @loop.attach(@watcher) - # logger.trace("start: new heartbeat watcher attached", - # :watcher => @watcher, - # :fd => @fd) + logger.trace("start: heartbeat IO watcher attached", + :watcher => @watcher, + :fd => @fd) end def shutdown @socket.close @watcher.detach - # logger.trace("shutdown: heartbeat watcher detached", - # :watcher => @watcher, - # :fd => @fd) + logger.trace("shutdown: heartbeat watcher detached", + :watcher => @watcher, + :fd => @fd) end private Modified: lib/droonga/job_pusher.rb (+5 -5) =================================================================== --- lib/droonga/job_pusher.rb 2015-04-23 17:01:43 +0900 (61a99ad) +++ lib/droonga/job_pusher.rb 2015-04-23 17:22:35 +0900 (12da93c) @@ -37,16 +37,16 @@ module Droonga end FileUtils.chmod(0600, @socket_path) @loop.attach(@server) - # logger.trace("connect: new server watcher attached", - # :watcher => @socket, - # :socket_path => @socket_path) + logger.trace("connect: socket watcher attached", + :watcher => @socket, + :socket_path => @socket_path) end def close return unless @server @server.close - # logger.trace("close: server watcher detached", - # :watcher => @socket) + logger.trace("close: socket watcher detached", + :watcher => @socket) end def shutdown Modified: lib/droonga/job_receiver.rb (+5 -5) =================================================================== --- lib/droonga/job_receiver.rb 2015-04-23 17:01:43 +0900 (e9420ea) +++ lib/droonga/job_receiver.rb 2015-04-23 17:22:35 +0900 (121f114) @@ -33,17 +33,17 @@ module Droonga @receiver = Coolio::UNIXSocket.connect(@socket_path) setup_receive_handler(@receiver) @loop.attach(@receiver) - # logger.trace("start: new receiver watcher attached", - # :watcher => @receiver, - # :socket_path => @socket_path) + logger.trace("start: socket watcher attached", + :watcher => @receiver, + :socket_path => @socket_path) logger.trace("start: done") end def shutdown logger.trace("shutdown: start") @receiver.close - # logger.trace("shutdown: receiver watcher attached", - # :watcher => @receiver) + logger.trace("shutdown: socket watcher attached", + :watcher => @receiver) logger.trace("shutdown: done") end Modified: lib/droonga/plugins/dump.rb (+6 -5) =================================================================== --- lib/droonga/plugins/dump.rb 2015-04-23 17:01:43 +0900 (ace2855) +++ lib/droonga/plugins/dump.rb 2015-04-23 17:22:35 +0900 (970498a) @@ -89,20 +89,21 @@ module Droonga runner.resume rescue timer.detach - # logger.trace("start: watcher detached on unexpected exception", - # :watcher => timer) + logger.trace("start: timer detached by unexpected exception", + :watcher => timer) logger.exception(error_message, $!) error(error_name, error_message) end else timer.detach - # logger.trace("start: watcher detached on unexpected exception", - # :watcher => timer) + logger.trace("start: timer detached by unexpected exception", + :watcher => timer) + logger.exception(error_message, $!) end end @loop.attach(timer) - logger.trace("start: new watcher attached", + logger.trace("start: timer attached", :watcher => timer) end Modified: lib/droonga/plugins/system/absorb_data.rb (+5 -4) =================================================================== --- lib/droonga/plugins/system/absorb_data.rb 2015-04-23 17:01:43 +0900 (e762102) +++ lib/droonga/plugins/system/absorb_data.rb 2015-04-23 17:22:35 +0900 (40b9a89) @@ -177,15 +177,16 @@ module Droonga runner.resume rescue timer.detach - # logger.trace("start: watcher detached on unexpected exception", - # :watcher => timer) + logger.trace("start: timer detached on unexpected exception", + :watcher => timer) logger.exception(error_message, $!) error(error_name, error_message) end else timer.detach - # logger.trace("start: watcher detached on unexpected exception", - # :watcher => timer) + logger.trace("start: timer detached on unexpected exception", + :watcher => timer) + logger.exception(error_message, $!) end end @loop.attach(timer) Modified: lib/droonga/process_supervisor.rb (+8 -8) =================================================================== --- lib/droonga/process_supervisor.rb 2015-04-23 17:01:43 +0900 (b3b0fd2) +++ lib/droonga/process_supervisor.rb 2015-04-23 17:22:35 +0900 (f021ade) @@ -36,20 +36,20 @@ module Droonga def start @loop.attach(@input) - # logger.trace("start: new input watcher attached", - # :watcher => @input) + logger.trace("start: input watcher attached", + :watcher => @input) @loop.attach(@output) - # logger.trace("start: new output watcher attached", - # :watcher => @output) + logger.trace("start: output watcher attached", + :watcher => @output) end def stop @input.close - # logger.trace("start: input watcher detached", - # :watcher => @input) + logger.trace("stop: input watcher detached", + :watcher => @input) @output.close - # logger.trace("start: output watcher detached", - # :watcher => @output) + logger.trace("stop: output watcher detached", + :watcher => @output) end def stop_gracefully Modified: lib/droonga/serf/agent.rb (+11 -20) =================================================================== --- lib/droonga/serf/agent.rb 2015-04-23 17:01:43 +0900 (40d88f8) +++ lib/droonga/serf/agent.rb 2015-04-23 17:22:35 +0900 (d33a2bd) @@ -195,42 +195,33 @@ module Droonga checker = Coolio::TCPSocket.connect(@host, @bind_port) - on_connect = lambda do + checker.on_connect do on_ready checker.close - # logger.trace("start_ready_check: checker watcher detached", - # :watcher => checker) - end - checker.on_connect do - on_connect.call + logger.trace("start_ready_check: socket detached", + :watcher => scoket) end - on_connect_failed = lambda do + checker.on_connect_failed do if @n_ready_checks >= MAX_N_READ_CHECKS on_failure else timer = Coolio::TimerWatcher.new(1) - on_timer = lambda do + timer.on_timer do start_ready_check timer.detach - # logger.trace("start_ready_check: timer watcher detached", - # :watcher => timer) - end - timer.on_timer do - on_timer.call + logger.trace("start_ready_check: timer detached", + :watcher => timer) end @loop.attach(timer) - # logger.trace("start_ready_check: new timer watcher attached", - # :watcher => timer) + logger.trace("start_ready_check: timer attached", + :watcher => timer) end end - checker.on_connect_failed do - on_connect_failed.call - end @loop.attach(checker) - # logger.trace("start_ready_check: new checker watcher attached", - # :watcher => checker) + logger.trace("start_ready_check: socket attached", + :watcher => checker) end def log_tag Modified: lib/droonga/worker_process_agent.rb (+7 -16) =================================================================== --- lib/droonga/worker_process_agent.rb 2015-04-23 17:01:43 +0900 (7adde99) +++ lib/droonga/worker_process_agent.rb 2015-04-23 17:22:35 +0900 (5f6397d) @@ -48,15 +48,15 @@ module Droonga output.write(Messages::FINISH) output.on_write_complete do output.close - # logger.trace("stop: output watcher detached", - # :watcher => output) + logger.trace("stop: output detached", + :watcher => output) end end if @input @input, input = nil, @input input.close - # logger.trace("stop: input watcher detached", - # :watcher => input) + logger.trace("stop: input detached", + :watcher => input) end logger.trace("stop: done") end @@ -84,7 +84,7 @@ module Droonga private def create_input(raw_input) @input = Coolio::IO.new(raw_input) - on_read = lambda do |data| + @input.on_read do |data| line_buffer = LineBuffer.new line_buffer.feed(data) do |line| logger.trace("line buffer feeded", :line => line); @@ -100,31 +100,22 @@ module Droonga end end end - @input.on_read do |data| - on_read.call(data) - end - on_close = lambda do + @input.on_close do if @input @input = nil on_stop_immediately end end - @input.on_close do - on_close.call - end end def create_output(raw_output) @output = Coolio::IO.new(raw_output) - on_close = lambda do + @output.on_close do if @output @output = nil on_stop_immediately end end - @output.on_close do - on_close.call - end end def on_stop_gracefully -------------- next part -------------- HTML����������������������������...Download