YUKI Hiroshi
null+****@clear*****
Thu Jul 17 17:54:45 JST 2014
YUKI Hiroshi 2014-07-17 17:54:45 +0900 (Thu, 17 Jul 2014) New Revision: 3fd67502d4ab0275b063a8943a097916c58f588f https://github.com/droonga/droonga-engine/commit/3fd67502d4ab0275b063a8943a097916c58f588f Message: Revert "Output log of serf event handler to a file" This reverts commit a78d2ec2c29b12b4bbead6541371ddabc1cf2ed4. Modified files: lib/droonga/command/serf_event_handler.rb Modified: lib/droonga/command/serf_event_handler.rb (+17 -29) =================================================================== --- lib/droonga/command/serf_event_handler.rb 2014-07-17 17:21:23 +0900 (d9659d4) +++ lib/droonga/command/serf_event_handler.rb 2014-07-17 17:54:45 +0900 (57812c4) @@ -20,13 +20,10 @@ require "droonga/serf" require "droonga/catalog_generator" require "droonga/data_absorber" require "droonga/safe_file_writer" -require "droonga/logger" module Droonga module Command class SerfEventHandler - include Loggable - class << self def run new.run @@ -37,11 +34,6 @@ module Droonga @serf = ENV["SERF"] || Serf.path @serf_rpc_address = ENV["SERF_RPC_ADDRESS"] || "127.0.0.1:7373" @serf_name = ENV["SERF_SELF_NAME"] - - log_file = File.open(Path.base + "serf-event-handler.log", "a") - Logger.default_output = log_file - $stdout.reopen(log_file) - $stderr.reopen(log_file) end def run @@ -61,11 +53,11 @@ module Droonga when "user" @event_sub_name = ENV["SERF_USER_EVENT"] @payload = JSON.parse($stdin.gets) - logger.info("event sub name = #{@event_sub_name}") + puts "event sub name = #{@event_sub_name}" when "query" @event_sub_name = ENV["SERF_QUERY_NAME"] @payload = JSON.parse($stdin.gets) - logger.info("event sub name = #{@event_sub_name}") + puts "event sub name = #{@event_sub_name}" end end @@ -110,7 +102,7 @@ module Droonga def join type = @payload["type"] - logger.info("type = #{type}") + puts "type = #{type}" case type when "replica" join_as_replica @@ -121,7 +113,7 @@ module Droonga source_node = @payload["source"] return unless source_node - logger.info("source_node = #{source_node}") + puts "source_node = #{source_node}" source_host = source_node.split(":").first @@ -139,12 +131,12 @@ module Droonga port = dataset.replicas.port other_hosts = dataset.replicas.hosts - logger.info("dataset = #{dataset_name}") - logger.info("port = #{port}") - logger.info("tag = #{tag}") + puts "dataset = #{dataset_name}" + puts "port = #{port}" + puts "tag = #{tag}" if @payload["copy"] - logger.info("starting to copy data from #{source_host}") + puts "starting to copy data from #{source_host}" modify_catalog do |modifier| modifier.datasets[dataset_name].replicas.hosts = [host] @@ -159,7 +151,7 @@ module Droonga sleep(1) end - logger.info("joining to the cluster: update myself") + puts "joining to the cluster: update myself" modify_catalog do |modifier| modifier.datasets[dataset_name].replicas.hosts += other_hosts @@ -167,7 +159,7 @@ module Droonga end sleep(1) # wait for restart - logger.info("joining to the cluster: update others") + puts "joining to the cluster: update others" source_node = "#{source_host}:#{port}/#{tag}" Serf.send_query(source_node, "add_replicas", @@ -230,7 +222,7 @@ module Droonga hosts = given_hosts return unless hosts - logger.info("new replicas: #{hosts.join(",")}") + puts "new replicas: #{hosts.join(",")}" modify_catalog do |modifier| modifier.datasets[dataset].replicas.hosts = hosts @@ -247,7 +239,7 @@ module Droonga hosts -= [host] return if hosts.empty? - logger.info("adding replicas: #{hosts.join(",")}") + puts "adding replicas: #{hosts.join(",")}" modify_catalog do |modifier| modifier.datasets[dataset].replicas.hosts += hosts @@ -262,7 +254,7 @@ module Droonga hosts = given_hosts return unless hosts - logger.info("removing replicas: #{hosts.join(",")}") + puts "removing replicas: #{hosts.join(",")}" modify_catalog do |modifier| modifier.datasets[dataset].replicas.hosts -= hosts @@ -285,7 +277,7 @@ module Droonga source = @payload["source"] return unless source - logger.info("start to absorb data from #{source}") + puts "start to absorb data from #{source}" dataset_name = @payload["dataset"] port = @payload["port"] @@ -304,9 +296,9 @@ module Droonga tag = dataset.replicas.tag end - logger.info("dataset = #{dataset_name}") - logger.info("port = #{port}") - logger.info("tag = #{tag}") + puts "dataset = #{dataset_name}" + puts "port = #{port}" + puts "tag = #{tag}" DataAbsorber.absorb(:dataset => dataset_name, :source_host => source, @@ -341,10 +333,6 @@ module Droonga status[key] = value SafeFileWriter.write(Serf.status_file, JSON.pretty_generate(status)) end - - def log_tag - "serf_event_handler" - end end end end -------------- next part -------------- HTML����������������������������...Download