Kouhei Sutou
null+****@clear*****
Thu May 22 12:41:43 JST 2014
Kouhei Sutou 2014-05-22 12:41:43 +0900 (Thu, 22 May 2014) New Revision: 07179d970f2865aa640676384110370334956185 https://github.com/droonga/droonga-engine/commit/07179d970f2865aa640676384110370334956185 Message: Include tag name to node name Modified files: lib/droonga/catalog/single_volume.rb lib/droonga/catalog/version1.rb lib/droonga/command/serf_event_handler.rb lib/droonga/live_nodes_list_loader.rb lib/droonga/serf.rb Modified: lib/droonga/catalog/single_volume.rb (+7 -1) =================================================================== --- lib/droonga/catalog/single_volume.rb 2014-05-22 12:12:20 +0900 (5db817f) +++ lib/droonga/catalog/single_volume.rb 2014-05-22 12:41:43 +0900 (1710ecb) @@ -24,8 +24,14 @@ module Droonga @data["address"] end + def node + ip_address_and_port, path = address.split("/") + tag = path.split(".").first + "#{ip_address_and_port}/#{tag}" + end + def all_nodes - @all_nodes ||= [address.split("/").first] + @all_nodes ||= [node] end end end Modified: lib/droonga/catalog/version1.rb (+1 -4) =================================================================== --- lib/droonga/catalog/version1.rb 2014-05-22 12:12:20 +0900 (a0a3168) +++ lib/droonga/catalog/version1.rb 2014-05-22 12:41:43 +0900 (5047b11) @@ -98,10 +98,7 @@ module Droonga end def collect_all_nodes - nodes = @data["zones"].collect do |zone| - zone.split("/").first - end - nodes.sort.uniq + @data["zones"].sort end def validate Modified: lib/droonga/command/serf_event_handler.rb (+1 -1) =================================================================== --- lib/droonga/command/serf_event_handler.rb 2014-05-22 12:12:20 +0900 (d170f18) +++ lib/droonga/command/serf_event_handler.rb 2014-05-22 12:41:43 +0900 (4e825d8) @@ -61,7 +61,7 @@ module Droonga name, address, status, = member.strip.split(/\s+/) if status == "alive" nodes[name] = { - "address" => address, + "serfAddress" => address, } end end Modified: lib/droonga/live_nodes_list_loader.rb (+1 -3) =================================================================== --- lib/droonga/live_nodes_list_loader.rb 2014-05-22 12:12:20 +0900 (bdef5de) +++ lib/droonga/live_nodes_list_loader.rb 2014-05-22 12:41:43 +0900 (9cd36be) @@ -25,9 +25,7 @@ module Droonga def load list_file = Pathname(@file_path) list = parse_list_file(list_file) - list.collect do |key, value| - value["address"] - end + list.keys end private Modified: lib/droonga/serf.rb (+1 -5) =================================================================== --- lib/droonga/serf.rb 2014-05-22 12:12:20 +0900 (09f13a6) +++ lib/droonga/serf.rb 2014-05-22 12:41:43 +0900 (05db25f) @@ -73,10 +73,6 @@ module Droonga node_name.split(":").first end - def address - @name.split("/", 2).first - end - def rpc_address "#{extract_host(@name)}:7373" end @@ -85,7 +81,7 @@ module Droonga catalog_observer = Droonga::CatalogObserver.new(@loop) catalog = catalog_observer.catalog other_nodes = catalog.all_nodes.reject do |node| - node == address + node == @name end other_nodes.collect do |node| extract_host(node) -------------- next part -------------- HTML����������������������������...Download