YUKI Hiroshi
null+****@clear*****
Wed Jun 25 17:26:46 JST 2014
YUKI Hiroshi 2014-06-25 17:26:46 +0900 (Wed, 25 Jun 2014) New Revision: be007d2e9651b42055f11f0174db33148249ec86 https://github.com/droonga/droonga-engine/commit/be007d2e9651b42055f11f0174db33148249ec86 Message: Rename "status" to "system.status" Because there is a known Groonga command "status". Modified files: lib/droonga/catalog_generator.rb test/command/config/default/catalog.json Renamed files: lib/droonga/plugins/system.rb (from lib/droonga/plugins/status.rb) test/command/suite/system/status.expected (from test/command/suite/status/minimum.expected) test/command/suite/system/status.test (from test/command/suite/status/minimum.test) test/unit/plugins/system/test_status.rb (from test/unit/plugins/test_status.rb) Modified: lib/droonga/catalog_generator.rb (+1 -1) =================================================================== --- lib/droonga/catalog_generator.rb 2014-06-25 15:37:06 +0900 (3d6bddf) +++ lib/droonga/catalog_generator.rb 2014-06-25 17:26:46 +0900 (87aeff5) @@ -20,7 +20,7 @@ module Droonga DEFAULT_DATASET = "Default" DEFAULT_HOSTS = ["127.0.0.1"] DEFAULT_N_WORKERS = 4 - DEFAULT_PLUGINS = ["groonga", "search", "crud", "dump", "status"] + DEFAULT_PLUGINS = ["groonga", "search", "crud", "dump", "system"] DEFAULT_PORT = 10031 DEFAULT_TAG = "droonga" Renamed: lib/droonga/plugins/system.rb (+4 -4) 90% =================================================================== --- lib/droonga/plugins/status.rb 2014-06-25 15:37:06 +0900 (12fdde0) +++ lib/droonga/plugins/system.rb 2014-06-25 17:26:46 +0900 (2688343) @@ -17,11 +17,11 @@ require "droonga/plugin" module Droonga module Plugins - module Status + module System extend Plugin register("status") - class Handler < Droonga::Handler + class StatusHandler < Droonga::Handler action.synchronous = true def handle(message) @@ -42,8 +42,8 @@ module Droonga end define_single_step do |step| - step.name = "status" - step.handler = Handler + step.name = "system.status" + step.handler = StatusHandler step.collector = Collectors::Or end end Modified: test/command/config/default/catalog.json (+1 -1) =================================================================== --- test/command/config/default/catalog.json 2014-06-25 15:37:06 +0900 (ca08feb) +++ test/command/config/default/catalog.json 2014-06-25 17:26:46 +0900 (4a29cf1) @@ -4,7 +4,7 @@ "datasets": { "Default": { "nWorkers": 4, - "plugins": ["groonga", "crud", "search", "dump", "status"], + "plugins": ["groonga", "crud", "search", "dump", "system"], "replicas": [ { "dimension": "_key", Renamed: test/command/suite/system/status.expected (+1 -1) 82% =================================================================== --- test/command/suite/status/minimum.expected 2014-06-25 15:37:06 +0900 (6c9ca3a) +++ test/command/suite/system/status.expected 2014-06-25 17:26:46 +0900 (6877f70) @@ -1,7 +1,7 @@ { "inReplyTo": "request-id", "statusCode": 200, - "type": "status.result", + "type": "system.status.result", "body": { "nodes": { "127.0.0.1:23003/droonga": { Renamed: test/command/suite/system/status.test (+1 -1) 60% =================================================================== --- test/command/suite/status/minimum.test 2014-06-25 15:37:06 +0900 (97891fe) +++ test/command/suite/system/status.test 2014-06-25 17:26:46 +0900 (14bddd3) @@ -1,5 +1,5 @@ { - "type": "status", + "type": "system.status", "dataset": "Default", "body": {} } Renamed: test/unit/plugins/system/test_status.rb (+6 -6) 82% =================================================================== --- test/unit/plugins/test_status.rb 2014-06-25 15:37:06 +0900 (983d1f3) +++ test/unit/plugins/system/test_status.rb 2014-06-25 17:26:46 +0900 (5ef9b96) @@ -13,9 +13,9 @@ # 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 "droonga/plugins/status" +require "droonga/plugins/system" -class StatusHandlerTest < Test::Unit::TestCase +class SystemStatusHandlerTest < Test::Unit::TestCase def setup setup_handler end @@ -31,10 +31,10 @@ class StatusHandlerTest < Test::Unit::TestCase @dispatcher = StubDispatcher.new @messenger.dispatcher = @dispatcher @loop = nil - @handler = Droonga::Plugins::Status::Handler.new("name", - @worker.context, - @messenger, - @loop) + @handler = Droonga::Plugins::System::StatusHandler.new("name", + @worker.context, + @messenger, + @loop) end def teardown_handler -------------- next part -------------- HTML����������������������������... Télécharger