Navigation Menu

Skip to content

Commit

Permalink
Export label of worker to handler
Browse files Browse the repository at this point in the history
  • Loading branch information
piroor committed Apr 29, 2015
1 parent 8a757f8 commit d122443
Show file tree
Hide file tree
Showing 16 changed files with 78 additions and 71 deletions.
12 changes: 6 additions & 6 deletions lib/droonga/handler.rb
Expand Up @@ -36,12 +36,12 @@ def action
end

attr_reader :label, :messenger, :loop
def initialize(name, label, context, messenger, loop)
@name = name
@label = label
@context = context
@messenger = messenger
@loop = loop
def initialize(params)
@name = params[:name]
@label = params[:label]
@context = params[:context]
@messenger = params[:messenger]
@loop = params[:loop]
end

def handle(message)
Expand Down
6 changes: 5 additions & 1 deletion lib/droonga/handler_runner.rb
Expand Up @@ -113,7 +113,11 @@ def process_type(handler_class, type, raw_message)
handler_message.validate

messenger = HandlerMessenger.new(@forwarder, handler_message, @options)
handler = handler_class.new(@name, @label, @context, messenger, @loop)
handler = handler_class.new(:name => @name,
:label => @label,
:context => @context,
:messenger => messenger,
:loop => @loop)
begin
result = handler.handle(handler_message)
unless result.nil?
Expand Down
3 changes: 3 additions & 0 deletions test/unit/catalog/test_version2.rb
Expand Up @@ -47,18 +47,21 @@ def test_slices
"localhost:23003/test.000" => {
:database => "#{base_path}/databases/000/db",
:dataset => "Test",
:label => "localhost:23003/test.000",
:plugins => ["plugin1", "plugin2", "plugin3"],
:n_workers => 4,
},
"localhost:23003/test.001" => {
:database => "#{base_path}/databases/001/db",
:dataset => "Test",
:label => "localhost:23003/test.001",
:plugins => ["plugin1", "plugin2", "plugin3"],
:n_workers => 4,
},
"localhost:23003/test.002" => {
:database => "#{base_path}/databases/002/db",
:dataset => "Test",
:label => "localhost:23003/test.002",
:plugins => ["plugin1", "plugin2", "plugin3"],
:n_workers => 4,
},
Expand Down
8 changes: 4 additions & 4 deletions test/unit/plugins/catalog/test_fetch.rb
Expand Up @@ -34,10 +34,10 @@ def setup_handler
@worker = StubWorker.new
@messenger = Droonga::Test::StubHandlerMessenger.new
@loop = nil
@handler = Droonga::Plugins::Catalog::FetchHandler.new("name",
@worker.context,
@messenger,
@loop)
@handler = Droonga::Plugins::Catalog::FetchHandler.new(:name => "name",
:context => @worker.context,
:messenger => @messenger,
:loop => @loop)
end

def teardown_handler
Expand Down
8 changes: 4 additions & 4 deletions test/unit/plugins/crud/test_add.rb
Expand Up @@ -37,10 +37,10 @@ def setup_handler
@worker = StubWorker.new
@messenger = Droonga::Test::StubHandlerMessenger.new
@loop = nil
@handler = Droonga::Plugins::CRUD::Handler.new("name",
@worker.context,
@messenger,
@loop)
@handler = Droonga::Plugins::CRUD::Handler.new(:name => "name",
:context => @worker.context,
:messenger => @messenger,
:loop => @loop)
end

def teardown_handler
Expand Down
8 changes: 4 additions & 4 deletions test/unit/plugins/groonga/test_column_create.rb
Expand Up @@ -15,10 +15,10 @@

class ColumnCreateTest < GroongaHandlerTest
def create_handler
Droonga::Plugins::Groonga::ColumnCreate::Handler.new("droonga",
@handler.context,
@messenger,
@loop)
Droonga::Plugins::Groonga::ColumnCreate::Handler.new(:name => "droonga",
:context => @handler.context,
:messenger => @messenger,
:loop => @loop)
end

def test_success
Expand Down
8 changes: 4 additions & 4 deletions test/unit/plugins/groonga/test_column_list.rb
Expand Up @@ -26,10 +26,10 @@ class ColumnListTest < GroongaHandlerTest
]

def create_handler
Droonga::Plugins::Groonga::ColumnList::Handler.new("droonga",
@handler.context,
@messenger,
@loop)
Droonga::Plugins::Groonga::ColumnList::Handler.new(:name => "droonga",
:context => @handler.context,
:messenger => @messenger,
:loop => @loop)
end

def virtual_key_column(id, table_name)
Expand Down
8 changes: 4 additions & 4 deletions test/unit/plugins/groonga/test_column_remove.rb
Expand Up @@ -15,10 +15,10 @@

class ColumnRemoveTest < GroongaHandlerTest
def create_handler
Droonga::Plugins::Groonga::ColumnRemove::Handler.new("droonga",
@handler.context,
@messenger,
@loop)
Droonga::Plugins::Groonga::ColumnRemove::Handler.new(:name => "droonga",
:context => @handler.context,
:messenger => @messenger,
:loop => @loop)
end

def test_success
Expand Down
8 changes: 4 additions & 4 deletions test/unit/plugins/groonga/test_column_rename.rb
Expand Up @@ -15,10 +15,10 @@

class ColumnRenameTest < GroongaHandlerTest
def create_handler
Droonga::Plugins::Groonga::ColumnRename::Handler.new("droonga",
@handler.context,
@messenger,
@loop)
Droonga::Plugins::Groonga::ColumnRename::Handler.new(:name => "droonga",
:context => @handler.context,
:messenger => @messenger,
:loop => @loop)
end

def test_success
Expand Down
8 changes: 4 additions & 4 deletions test/unit/plugins/groonga/test_delete.rb
Expand Up @@ -15,10 +15,10 @@

class DeleteTest < GroongaHandlerTest
def create_handler
Droonga::Plugins::Groonga::Delete::Handler.new("droonga",
@handler.context,
@messenger,
@loop)
Droonga::Plugins::Groonga::Delete::Handler.new(:name => "droonga",
:context => @handler.context,
:messenger => @messenger,
:loop => @loop)
end

def test_success
Expand Down
8 changes: 4 additions & 4 deletions test/unit/plugins/groonga/test_table_create.rb
Expand Up @@ -15,10 +15,10 @@

class TableCreateTest < GroongaHandlerTest
def create_handler
Droonga::Plugins::Groonga::TableCreate::Handler.new("droonga",
@handler.context,
@messenger,
@loop)
Droonga::Plugins::Groonga::TableCreate::Handler.new(:name => "droonga",
:context => @handler.context,
:messenger => @messenger,
:loop => @loop)
end

def test_success
Expand Down
8 changes: 4 additions & 4 deletions test/unit/plugins/groonga/test_table_list.rb
Expand Up @@ -26,10 +26,10 @@ class TableListTest < GroongaHandlerTest
]

def create_handler
Droonga::Plugins::Groonga::TableList::Handler.new("droonga",
@handler.context,
@messenger,
@loop)
Droonga::Plugins::Groonga::TableList::Handler.new(:name => "droonga",
:context => @handler.context,
:messenger => @messenger,
:loop => @loop)
end

def test_success
Expand Down
8 changes: 4 additions & 4 deletions test/unit/plugins/groonga/test_table_remove.rb
Expand Up @@ -15,10 +15,10 @@

class TableRemoveTest < GroongaHandlerTest
def create_handler
Droonga::Plugins::Groonga::TableRemove::Handler.new("droonga",
@handler.context,
@messenger,
@loop)
Droonga::Plugins::Groonga::TableRemove::Handler.new(:name => "droonga",
:context => @handler.context,
:messenger => @messenger,
:loop => @loop)
end

def setup
Expand Down
8 changes: 4 additions & 4 deletions test/unit/plugins/search/test_handler.rb
Expand Up @@ -31,10 +31,10 @@ def setup_plugin
@handler = Droonga::Test::StubHandler.new
@messenger = Droonga::Test::StubHandlerMessenger.new
@loop = nil
@plugin = Droonga::Plugins::Search::Handler.new("droonga",
@handler.context,
@messenger,
@loop)
@plugin = Droonga::Plugins::Search::Handler.new(:name => "droonga",
:context => @handler.context,
:messenger => @messenger,
:loop => @loop)
end

def teardown_plugin
Expand Down
8 changes: 4 additions & 4 deletions test/unit/plugins/system/test_status.rb
Expand Up @@ -31,10 +31,10 @@ def setup_handler
@messenger.cluster = StubCluster.new
@messenger.engine_state = StubEngineState.new
@loop = nil
@handler = Droonga::Plugins::System::StatusHandler.new("name",
@worker.context,
@messenger,
@loop)
@handler = Droonga::Plugins::System::StatusHandler.new(:name => "name",
:context => @worker.context,
:messenger => @messenger,
:loop => @loop)
end

def teardown_handler
Expand Down
32 changes: 16 additions & 16 deletions test/unit/plugins/test_watch.rb
Expand Up @@ -52,10 +52,10 @@ def process(command, request, headers={})
public
class SubscribeTest < self
def create_plugin
Droonga::Plugins::Watch::SubscribeHandler.new("droonga",
@handler.context,
@messenger,
@loop)
Droonga::Plugins::Watch::SubscribeHandler.new(:name => "droonga",
:context => @handler.context,
:messenger => @messenger,
:loop => @loop)
end

def test_subscribe
Expand Down Expand Up @@ -119,10 +119,10 @@ def setup
end

def create_plugin
Droonga::Plugins::Watch::UnsubscribeHandler.new("droonga",
@handler.context,
@messenger,
@loop)
Droonga::Plugins::Watch::UnsubscribeHandler.new(:name => "droonga",
:context => @handler.context,
:messenger => @messenger,
:loop => @loop)
end

def test_unsubscribe
Expand Down Expand Up @@ -154,10 +154,10 @@ def setup
end

def create_plugin
Droonga::Plugins::Watch::FeedHandler.new("droonga",
@handler.context,
@messenger,
@loop)
Droonga::Plugins::Watch::FeedHandler.new(:name => "droonga",
:context => @handler.context,
:messenger => @messenger,
:loop => @loop)
end

def test_feed_match
Expand Down Expand Up @@ -200,10 +200,10 @@ def setup_subscription
}
message = Droonga::Test::StubHandlerMessage.new(request, {})
subscribe_handler =
Droonga::Plugins::Watch::SubscribeHandler.new("droonga",
@handler.context,
@messenger,
@loop)
Droonga::Plugins::Watch::SubscribeHandler.new(:name => "droonga",
:context => @handler.context,
:messenger => @messenger,
:loop => @loop)
response = subscribe_handler.handle(message)
assert_equal(SUCCESS_RESULT, response)
end
Expand Down

0 comments on commit d122443

Please sign in to comment.