YUKI Hiroshi
null+****@clear*****
Fri Mar 27 21:03:30 JST 2015
YUKI Hiroshi 2015-03-27 21:03:30 +0900 (Fri, 27 Mar 2015) New Revision: 362da6739fcea2bdabb335156afec3a3d8f1833d https://github.com/droonga/droonga-engine/commit/362da6739fcea2bdabb335156afec3a3d8f1833d Message: Output more trace logs for watchers Modified files: lib/droonga/command/droonga_engine.rb lib/droonga/file_observer.rb lib/droonga/fluent_message_receiver.rb lib/droonga/fluent_message_sender.rb lib/droonga/job_pusher.rb lib/droonga/job_receiver.rb lib/droonga/node_metadata.rb lib/droonga/plugins/dump.rb lib/droonga/process_supervisor.rb lib/droonga/serf/agent.rb lib/droonga/worker_process_agent.rb Modified: lib/droonga/command/droonga_engine.rb (+2 -0) =================================================================== --- lib/droonga/command/droonga_engine.rb 2015-03-27 21:03:21 +0900 (85da263) +++ lib/droonga/command/droonga_engine.rb 2015-03-27 21:03:30 +0900 (9b0f083) @@ -738,6 +738,7 @@ module Droonga on_signal.call end @loop.attach(@async_watcher) + logger.trace("start: new watcher attached", :watcher => @async_watcher) logger.trace("start: done") end @@ -745,6 +746,7 @@ module Droonga return if @async_watcher.nil? logger.trace("stop: stert") @async_watcher.detach + logger.trace("stop: watcher detached", :watcher => @async_watcher) @async_watcher = nil logger.trace("stop: done") end Modified: lib/droonga/file_observer.rb (+6 -0) =================================================================== --- lib/droonga/file_observer.rb 2015-03-27 21:03:21 +0900 (63e75e2) +++ lib/droonga/file_observer.rb 2015-03-27 21:03:30 +0900 (0de9814) @@ -50,10 +50,16 @@ module Droonga on_timer.call end @loop.attach(@watcher) + logger.trace("start: new file watcher attached", + :watcher => @watcher, + :path => @path) end def stop @watcher.detach + logger.trace("start: file watcher detached", + :watcher => @watcher, + :path => @path) end private Modified: lib/droonga/fluent_message_receiver.rb (+18 -0) =================================================================== --- lib/droonga/fluent_message_receiver.rb 2015-03-27 21:03:21 +0900 (5b998c9) +++ lib/droonga/fluent_message_receiver.rb 2015-03-27 21:03:30 +0900 (ca2c012) @@ -89,6 +89,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: done") end @@ -100,6 +104,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: done") end @@ -108,6 +114,8 @@ module Droonga end class HeartbeatReceiver + include Loggable + def initialize(loop, fd) @loop = loop @fd = fd @@ -124,11 +132,17 @@ module Droonga on_readable.call end @loop.attach(@watcher) + logger.trace("start: new heartbeat watcher attached", + :watcher => @watcher, + :fd => @fd) end def shutdown @socket.close @watcher.detach + logger.trace("shutdown: heartbeat watcher detached", + :watcher => @watcher, + :fd => @fd) end private @@ -153,6 +167,10 @@ module Droonga rescue SystemCallError end end + + def log_tag + "heartbeat-receiver" + end end class Client Modified: lib/droonga/fluent_message_sender.rb (+9 -1) =================================================================== --- lib/droonga/fluent_message_sender.rb 2015-03-27 21:03:21 +0900 (9259c47) +++ lib/droonga/fluent_message_sender.rb 2015-03-27 21:03:30 +0900 (c5cae21) @@ -104,13 +104,21 @@ module Droonga on_close.call end @loop.attach(@socket) + logger.trace("connect: new socket watcher attached", + :watcher => @socket, + :host => @host, + :port => @port) logger.trace("connect: done") end def shutdown_socket return unless connected? - @socket.close unles****@socke*****? + unles****@socke*****? + @socket.close + logger.trace("shutdown_socket: socket watcher detached", + :watcher => @socket) + end end def create_packed_fluent_message(tag, data) Modified: lib/droonga/job_pusher.rb (+8 -2) =================================================================== --- lib/droonga/job_pusher.rb 2015-03-27 21:03:21 +0900 (9111a54) +++ lib/droonga/job_pusher.rb 2015-03-27 21:03:30 +0900 (bae8b68) @@ -37,15 +37,21 @@ module Droonga end FileUtils.chmod(0600, @socket_path) @loop.attach(@server) + logger.trace("connect: new server watcher attached", + :watcher => @socket, + :socket_path => @socket_path) end def close - @server.close if @server + return unless @server + @server.close + logger.trace("close: server watcher detached", + :watcher => @socket) end def shutdown logger.trace("shutdown: start") - @server.close if @server + close @job_queue.close FileUtils.rm_f(@socket_path) logger.trace("shutdown: done") Modified: lib/droonga/job_receiver.rb (+5 -0) =================================================================== --- lib/droonga/job_receiver.rb 2015-03-27 21:03:21 +0900 (c3c9935) +++ lib/droonga/job_receiver.rb 2015-03-27 21:03:30 +0900 (1ba2581) @@ -33,12 +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: done") end def shutdown logger.trace("shutdown: start") @receiver.close + logger.trace("shutdown: receiver watcher attached", + :watcher => @receiver) logger.trace("shutdown: done") end Modified: lib/droonga/node_metadata.rb (+1 -0) =================================================================== --- lib/droonga/node_metadata.rb 2015-03-27 21:03:21 +0900 (d52dd6a) +++ lib/droonga/node_metadata.rb 2015-03-27 21:03:30 +0900 (aa8ef7a) @@ -92,6 +92,7 @@ module Droonga def stop_observe return unless @file_observer @file_observer.stop + @file_observer = nil end private Modified: lib/droonga/plugins/dump.rb (+6 -0) =================================================================== --- lib/droonga/plugins/dump.rb 2015-03-27 21:03:21 +0900 (4c9c20b) +++ lib/droonga/plugins/dump.rb 2015-03-27 21:03:30 +0900 (63bdbd5) @@ -113,13 +113,19 @@ module Droonga dumper.resume rescue FiberError timer.detach + logger.trace("start_dump: watcher detached on FiberError", + :watcher => timer) rescue timer.detach + logger.trace("start_dump: watcher detached on unexpected exception", + :watcher => timer) on_error.call($!) end end @loop.attach(timer) + logger.trace("start_dump: new watcher attached", + :watcher => timer) end private Modified: lib/droonga/process_supervisor.rb (+8 -0) =================================================================== --- lib/droonga/process_supervisor.rb 2015-03-27 21:03:21 +0900 (9d21af6) +++ lib/droonga/process_supervisor.rb 2015-03-27 21:03:30 +0900 (13e7b49) @@ -36,12 +36,20 @@ module Droonga def start @loop.attach(@input) + logger.trace("start: new input watcher attached", + :watcher => @input) @loop.attach(@output) + logger.trace("start: new output watcher attached", + :watcher => @output) end def stop @input.close + logger.trace("start: input watcher detached", + :watcher => @input) @output.close + logger.trace("start: output watcher detached", + :watcher => @output) end def stop_gracefully Modified: lib/droonga/serf/agent.rb (+16 -0) =================================================================== --- lib/droonga/serf/agent.rb 2015-03-27 21:03:21 +0900 (dd19732) +++ lib/droonga/serf/agent.rb 2015-03-27 21:03:30 +0900 (d8d716b) @@ -62,7 +62,11 @@ module Droonga return if****@pid*****? Process.waitpid(@pid) @output_io.close + logger.trace("stop: output_io watcher detached", + :watcher => @output_io) @error_io.close + logger.trace("stop: error_io watcher detached", + :watcher => @error_io) @pid = nil end @@ -107,6 +111,8 @@ module Droonga on_read_output.call(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| @@ -117,6 +123,8 @@ module Droonga on_read_error.call(data) end @loop.attach(@error_io) + logger.trace("capture_output: new error_io watcher attached", + :watcher => @error_io) result end @@ -186,6 +194,8 @@ module Droonga on_connect = lambda do on_ready checker.close + logger.trace("start_ready_check: checker watcher detached", + :watcher => checker) end checker.on_connect do on_connect.call @@ -199,11 +209,15 @@ module Droonga on_timer = lambda do start_ready_check timer.detach + logger.trace("start_ready_check: timer watcher detached", + :watcher => timer) end timer.on_timer do on_timer.call end @loop.attach(timer) + logger.trace("start_ready_check: new timer watcher attached", + :watcher => timer) end end checker.on_connect_failed do @@ -211,6 +225,8 @@ module Droonga end @loop.attach(checker) + logger.trace("start_ready_check: new checker watcher attached", + :watcher => checker) end def log_tag Modified: lib/droonga/worker_process_agent.rb (+8 -0) =================================================================== --- lib/droonga/worker_process_agent.rb 2015-03-27 21:03:21 +0900 (577d4d5) +++ lib/droonga/worker_process_agent.rb 2015-03-27 21:03:30 +0900 (8f1bbfe) @@ -33,7 +33,11 @@ module Droonga def start logger.trace("start: start") @loop.attach(@input) + logger.trace("start: new input watcher attached", + :watcher => @input) @loop.attach(@output) + logger.trace("start: new output watcher attached", + :watcher => @output) logger.trace("start: done") end @@ -44,11 +48,15 @@ module Droonga output.write(Messages::FINISH) output.on_write_complete do output.close + logger.trace("stop: output watcher detached", + :watcher => output) end end if @input @input, input = nil, @input input.close + logger.trace("stop: input watcher detached", + :watcher => input) end logger.trace("stop: done") end -------------- next part -------------- HTML����������������������������...Download