YUKI Hiroshi
null+****@clear*****
Fri Apr 17 18:15:25 JST 2015
YUKI Hiroshi 2015-04-17 18:15:25 +0900 (Fri, 17 Apr 2015) New Revision: 8885e817672b61af27815f5da5f6e321c179eceb https://github.com/droonga/droonga-engine/commit/8885e817672b61af27815f5da5f6e321c179eceb Message: Store node's name as a NodeName for serf Modified files: lib/droonga/serf.rb Modified: lib/droonga/serf.rb (+7 -7) =================================================================== --- lib/droonga/serf.rb 2015-04-17 18:10:46 +0900 (294a24c) +++ lib/droonga/serf.rb 2015-04-17 18:15:25 +0900 (5ff07b5) @@ -39,7 +39,7 @@ module Droonga def initialize(name, options={}) @serf = nil - @name = name + @name = NodeName.new(name) @verbose = options[:verbose] || false @service_installation = ServiceInstallation.new @node_metadata = NodeMetadata.new @@ -54,8 +54,8 @@ module Droonga retry_joins.push("-retry-join", other_host) end agent = Agent.new(loop, @serf, - extract_host(@name), agent_port, rpc_port, - "-node", @name, + @name.host, agent_port, rpc_port, + "-node", @name.to_s, "-event-handler", "droonga-engine-serf-event-handler", "-tag", "type=engine", "-tag", "role=#{role}", @@ -242,11 +242,11 @@ module Droonga end def extract_host(node_name) - node_name.split(":").first + node_name.to_s.split(":").first end def rpc_address - "#{extract_host(@name)}:#{rpc_port}" + "#{@name.host}:#{rpc_port}" end def rpc_port @@ -261,10 +261,10 @@ module Droonga loader = Catalog::Loader.new(Path.catalog.to_s) catalog = loader.load other_nodes = catalog.all_nodes.reject do |node| - node == @name + node ==****@name*****_s end other_nodes.collect do |node| - extract_host(node) + NodeName.new(node).host end end -------------- next part -------------- HTML����������������������������...Download