Navigation Menu

Skip to content

Commit

Permalink
Specify catalog as a parameter
Browse files Browse the repository at this point in the history
  • Loading branch information
piroor committed Jan 16, 2015
1 parent d3d2fa5 commit 3eb08e5
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion lib/droonga/cluster.rb
Expand Up @@ -29,7 +29,7 @@ class Cluster
def initialize(loop, params)
@loop = loop

@catalog = nil
@catalog = params[:catalog]
@state = nil
@on_change = nil
@node_metadata = params[:metadata]
Expand Down
5 changes: 3 additions & 2 deletions lib/droonga/engine.rb
Expand Up @@ -32,14 +32,15 @@ class Engine

attr_writer :on_ready
def initialize(loop, name, internal_name)
@catalog = load_catalog
@node_metadata = NodeMetadata.new
@state = EngineState.new(loop, name,
internal_name,
:catalog => @catalog,
:metadata => @node_metadata)
@cluster = Cluster.new(loop,
:catalog => @catalog,
:metadata => @node_metadata)
@catalog = load_catalog
@state.catalog = @cluster.catalog = @catalog

@dispatcher = create_dispatcher

Expand Down
2 changes: 1 addition & 1 deletion lib/droonga/engine_state.rb
Expand Up @@ -46,7 +46,7 @@ def initialize(loop, name, internal_name, params)
@replier = Replier.new(@forwarder)
@on_ready = nil
@on_finish = nil
@catalog = nil
@catalog = params[:catalog]
@node_metadata = params[:metadata]
end

Expand Down

0 comments on commit 3eb08e5

Please sign in to comment.