Kouhei Sutou
null+****@clear*****
Wed Oct 16 11:39:23 JST 2013
Kouhei Sutou 2013-10-16 11:39:23 +0900 (Wed, 16 Oct 2013) New Revision: 88e2452f62f1f1cc00201d57dc5ab77fa1f57e83 https://github.com/droonga/fluent-plugin-droonga/commit/88e2452f62f1f1cc00201d57dc5ab77fa1f57e83 Message: Add process ID to logs in server and worker Modified files: lib/droonga/server.rb lib/droonga/worker.rb Modified: lib/droonga/server.rb (+15 -10) =================================================================== --- lib/droonga/server.rb 2013-10-16 10:37:42 +0900 (28cc399) +++ lib/droonga/server.rb 2013-10-16 11:39:23 +0900 (fe1bd36) @@ -20,36 +20,41 @@ require "groonga" module Droonga module Server def before_run - $log.trace("server: before_run: start") + $log.trace("#{log_tag}: before_run: start") # TODO: Use JobQueue object @context = Groonga::Context.new @database =****@conte*****_database(config[:database]) @queue = @context[config[:queue_name]] - $log.trace("server: before_run: done") + $log.trace("#{log_tag}: before_run: done") end def after_run - $log.trace("server: after_run: start") + $log.trace("#{log_tag}: after_run: start") @queue.close @database.close @context.close - $log.trace("server: after_run: done") + $log.trace("#{log_tag}: after_run: done") end def stop(stop_graceful) - $log.trace("server: stop: start") + $log.trace("#{log_tag}: stop: start") - $log.trace("server: stop: queue: unblock: start") + $log.trace("#{log_tag}: stop: queue: unblock: start") 3.times do |i| - $log.trace("server: stop: queue: unblock: #{i}: start") + $log.trace("#{log_tag}: stop: queue: unblock: #{i}: start") super(stop_graceful) @queue.unblock sleep(i ** 2 * 0.1) - $log.trace("server: stop: queue: unblock: #{i}: done") + $log.trace("#{log_tag}: stop: queue: unblock: #{i}: done") end - $log.trace("server: stop: queue: unblock: done") + $log.trace("#{log_tag}: stop: queue: unblock: done") - $log.trace("server: stop: done") + $log.trace("#{log_tag}: stop: done") + end + + private + def log_tag + "[#{Process.ppid}][#{Process.pid}] server:" end end end Modified: lib/droonga/worker.rb (+11 -6) =================================================================== --- lib/droonga/worker.rb 2013-10-16 10:37:42 +0900 (54b198f) +++ lib/droonga/worker.rb 2013-10-16 11:39:23 +0900 (d20e367) @@ -26,21 +26,26 @@ module Droonga end def run - $log.trace("worker: run: start") + $log.trace("#{log_tag}: run: start") @running = true while @running - $log.trace("worker: run: pull_message: start") + $log.trace("#{log_tag}: run: pull_message: start") @executor.execute_one - $log.trace("worker: run: pull_message: done") + $log.trace("#{log_tag}: run: pull_message: done") end @executor.shutdown - $log.trace("worker: run: done") + $log.trace("#{log_tag}: run: done") end def stop - $log.trace("worker: stop: start") + $log.trace("#{log_tag}: stop: start") @running = false - $log.trace("worker: stop: done") + $log.trace("#{log_tag}: stop: done") + end + + private + def log_tag + "[#{Process.ppid}][#{Process.pid}] worker" end end end -------------- next part -------------- HTML����������������������������...Download