Kouhei Sutou
null+****@clear*****
Mon Jan 5 16:45:41 JST 2015
Kouhei Sutou 2015-01-05 16:45:41 +0900 (Mon, 05 Jan 2015) New Revision: 7d4033f9fc9ea3594b0b8ec3bd46fa762ffecf19 https://github.com/droonga/droonga-engine/commit/7d4033f9fc9ea3594b0b8ec3bd46fa762ffecf19 Message: serf: move agent related code Modified files: lib/droonga/serf.rb lib/droonga/serf_agent.rb Modified: lib/droonga/serf.rb (+0 -13) =================================================================== --- lib/droonga/serf.rb 2015-01-05 16:43:59 +0900 (ff06e3e) +++ lib/droonga/serf.rb 2015-01-05 16:45:41 +0900 (6242fa4) @@ -52,7 +52,6 @@ module Droonga extract_host(@name), agent_port, rpc_port, "-node", @name, "-event-handler", "droonga-engine-serf-event-handler", - "-log-level", log_level, "-tag", "type=engine", "-tag", "role=#{role}", "-tag", "cluster_id=#{cluster_id}", @@ -200,18 +199,6 @@ module Droonga node_name.split(":").first end - def log_level - level = Logger::Level.default - case level - when "trace", "debug", "info", "warn" - level - when "error", "fatal" - "err" - else - level # Or error? - end - end - def rpc_address "#{extract_host(@name)}:#{rpc_port}" end Modified: lib/droonga/serf_agent.rb (+13 -0) =================================================================== --- lib/droonga/serf_agent.rb 2015-01-05 16:43:59 +0900 (b011098) +++ lib/droonga/serf_agent.rb 2015-01-05 16:45:41 +0900 (b26afd7) @@ -52,6 +52,7 @@ module Droonga @pid = spawn(env, @serf, "agent", "-bind", "#{@host}:#{@bind_port}", "-rpc-addr", "#{@host}:#{@rpc_port}", + "-log-level", serf_log_level, *@options, spawn_options) end start_ready_check @@ -70,6 +71,18 @@ module Droonga end private + def serf_log_level + level = Logger::Level.default + case level + when "trace", "debug", "info", "warn" + level + when "error", "fatal" + "err" + else + level # Or error? + end + end + def capture_output result = nil output_read, output_write = IO.pipe -------------- next part -------------- HTML����������������������������...ダウンロード
