YUKI Hiroshi
null+****@clear*****
Wed Apr 15 14:32:40 JST 2015
YUKI Hiroshi 2015-04-15 14:32:40 +0900 (Wed, 15 Apr 2015) New Revision: 2c11f276e7e221c35c8ae177453e0a49575dcd3c https://github.com/droonga/droonga-engine/commit/2c11f276e7e221c35c8ae177453e0a49575dcd3c Message: Move CatalogLoader to Catalog::Loader Modified files: lib/droonga/engine.rb lib/droonga/serf.rb Renamed files: lib/droonga/catalog/loader.rb (from lib/droonga/catalog_loader.rb) Renamed: lib/droonga/catalog/loader.rb (+3 -1) 98% =================================================================== --- lib/droonga/catalog_loader.rb 2015-04-15 14:30:42 +0900 (e4ba3bb) +++ lib/droonga/catalog/loader.rb 2015-04-15 14:32:40 +0900 (1f573e6) @@ -19,7 +19,8 @@ require "droonga/catalog/version1" require "droonga/catalog/version2" module Droonga - class CatalogLoader + module Catalog + class Loader def initialize(path=nil) @path = path end @@ -61,4 +62,5 @@ module Droonga end end end + end end Modified: lib/droonga/engine.rb (+2 -2) =================================================================== --- lib/droonga/engine.rb 2015-04-15 14:30:42 +0900 (e068a83) +++ lib/droonga/engine.rb 2015-04-15 14:32:40 +0900 (d345143) @@ -22,7 +22,7 @@ require "droonga/loggable" require "droonga/deferrable" require "droonga/engine_state" require "droonga/cluster" -require "droonga/catalog_loader" +require "droonga/catalog/loader" require "droonga/dispatcher" require "droonga/node_metadata" @@ -102,7 +102,7 @@ module Droonga private def load_catalog catalog_path = Path.catalog - loader = CatalogLoader.new(catalog_path.to_s) + loader = Catalog::Loader.new(catalog_path.to_s) catalog = loader.load logger.info("catalog loaded", :path => catalog_path.to_s, Modified: lib/droonga/serf.rb (+3 -3) =================================================================== --- lib/droonga/serf.rb 2015-04-15 14:30:42 +0900 (1117dcf) +++ lib/droonga/serf.rb 2015-04-15 14:32:40 +0900 (294a24c) @@ -17,7 +17,7 @@ require "json" require "droonga/path" require "droonga/loggable" -require "droonga/catalog_loader" +require "droonga/catalog/loader" require "droonga/node_metadata" require "droonga/serf/downloader" require "droonga/serf/agent" @@ -198,7 +198,7 @@ module Droonga end def cluster_id - loader = CatalogLoader.new(Path.catalog.to_s) + loader = Catalog::Loader.new(Path.catalog.to_s) catalog = loader.load catalog.cluster_id end @@ -258,7 +258,7 @@ module Droonga end def detect_other_hosts - loader = CatalogLoader.new(Path.catalog.to_s) + loader = Catalog::Loader.new(Path.catalog.to_s) catalog = loader.load other_nodes = catalog.all_nodes.reject do |node| node == @name -------------- next part -------------- HTML����������������������������...Download