Navigation Menu

Skip to content

Commit

Permalink
Move CatalogLoader to Catalog::Loader
Browse files Browse the repository at this point in the history
  • Loading branch information
piroor committed Apr 15, 2015
1 parent b3dadb5 commit 2c11f27
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
Expand Up @@ -19,7 +19,8 @@
require "droonga/catalog/version2"

module Droonga
class CatalogLoader
module Catalog
class Loader
def initialize(path=nil)
@path = path
end
Expand Down Expand Up @@ -61,4 +62,5 @@ def parse(data)
end
end
end
end
end
4 changes: 2 additions & 2 deletions lib/droonga/engine.rb
Expand Up @@ -22,7 +22,7 @@
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"

Expand Down Expand Up @@ -102,7 +102,7 @@ def process(message)
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,
Expand Down
6 changes: 3 additions & 3 deletions lib/droonga/serf.rb
Expand Up @@ -17,7 +17,7 @@

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"
Expand Down Expand Up @@ -198,7 +198,7 @@ def accept_messages_newer_than(timestamp)
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
Expand Down Expand Up @@ -258,7 +258,7 @@ def agent_port
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
Expand Down

0 comments on commit 2c11f27

Please sign in to comment.