Navigation Menu

Skip to content

Commit

Permalink
serf: move agent related code
Browse files Browse the repository at this point in the history
  • Loading branch information
kou committed Jan 5, 2015
1 parent c846c97 commit 7d4033f
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
13 changes: 0 additions & 13 deletions lib/droonga/serf.rb
Expand Up @@ -52,7 +52,6 @@ def run_agent(loop)
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}",
Expand Down Expand Up @@ -200,18 +199,6 @@ def extract_host(node_name)
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
Expand Down
13 changes: 13 additions & 0 deletions lib/droonga/serf_agent.rb
Expand Up @@ -52,6 +52,7 @@ def start
@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
Expand All @@ -70,6 +71,18 @@ def running?
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
Expand Down

0 comments on commit 7d4033f

Please sign in to comment.