YUKI Hiroshi
null+****@clear*****
Thu May 8 19:54:18 JST 2014
YUKI Hiroshi 2014-05-08 19:54:18 +0900 (Thu, 08 May 2014) New Revision: d4ec6d2245f7adcf4fae3ae50e1f175b8116034a https://github.com/droonga/droonga-engine/commit/d4ec6d2245f7adcf4fae3ae50e1f175b8116034a Message: Split codes for LiveNodesListLoader and LiveNodesList Copied files: lib/droonga/live_nodes_list_loader.rb (from lib/droonga/catalog/live_nodes_list.rb) Modified files: lib/droonga/catalog/live_nodes_list.rb lib/droonga/catalog_observer.rb Modified: lib/droonga/catalog/live_nodes_list.rb (+3 -26) =================================================================== --- lib/droonga/catalog/live_nodes_list.rb 2014-05-08 19:43:38 +0900 (368c98c) +++ lib/droonga/catalog/live_nodes_list.rb 2014-05-08 19:54:18 +0900 (f3babb0) @@ -13,39 +13,16 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -require "pathname" -require "json" - module Droonga module Catalog class LiveNodesList - def initialize(list_file) - @list_file = Pathname(list_file) - @list = parse_list_file + def initialize(list) + @list = list end def live_node?(node) @list.key?(node) end - - private - def parse_list_file - return default_list unless @list_file - return default_list unless @list_file.exist? - - contents = @list_file.read - return default_list if contents.empty? - - begin - JSON.parse(contents).keys - rescue JSON::ParserError - default_list - end - end - - def default_list - {} - end - end + emd end end Modified: lib/droonga/catalog_observer.rb (+0 -6) =================================================================== --- lib/droonga/catalog_observer.rb 2014-05-08 19:43:38 +0900 (6a82b42) +++ lib/droonga/catalog_observer.rb 2014-05-08 19:54:18 +0900 (83b36b7) @@ -23,7 +23,6 @@ module Droonga include Loggable DEFAULT_CATALOG_PATH = "catalog.json" - DEFAULT_LIVE_NODES_LIST_PATH = "live-nodes.json" CHECK_INTERVAL = 1 attr_reader :catalog @@ -80,11 +79,6 @@ module Droonga @catalog_mtime = File.mtime(@catalog_path) end - def live_nodes_list_path - path = ENV["DROONGA_LIVE_NODES_LIST"] || DEFAULT_LIVE_NODES_LIST_PATH - File.expand_path(path, base_path) - end - private def log_tag "catalog-observer" Copied: lib/droonga/live_nodes_list_loader.rb (+30 -23) 50% =================================================================== --- lib/droonga/catalog/live_nodes_list.rb 2014-05-08 19:43:38 +0900 (368c98c) +++ lib/droonga/live_nodes_list_loader.rb 2014-05-08 19:54:18 +0900 (f015a0f) @@ -15,37 +15,44 @@ require "pathname" require "json" +require "dronga/live_nodes_list" module Droonga - module Catalog - class LiveNodesList - def initialize(list_file) - @list_file = Pathname(list_file) - @list = parse_list_file - end + class LiveNodesListLoader + DEFAULT_LIST_PATH = "live-nodes.json" - def live_node?(node) - @list.key?(node) - end + def base_path + ENV["DROONGA_BASE_DIR"] + end - private - def parse_list_file - return default_list unless @list_file - return default_list unless @list_file.exist? + def file_path + path = ENV["DROONGA_LIVE_NODES_LIST"] || DEFAULT_LIST_PATH + File.expand_path(path, base_path) + end - contents = @list_file.read - return default_list if contents.empty? + def load + list_file = Pathname(file_path) + list = parse_list_file(list_file) + LiveNodesList.new(list) + end - begin - JSON.parse(contents).keys - rescue JSON::ParserError - default_list - end - end + private + def parse_list_file(list_file) + return default_list unless list_file + return default_list unless list_file.exist? + + contents = list_file.read + return default_list if contents.empty? - def default_list - {} + begin + JSON.parse(contents).keys + rescue JSON::ParserError + default_list end end + + def default_list + {} + end end end -------------- next part -------------- HTML����������������������������...下载
