YUKI Hiroshi
null+****@clear*****
Wed Mar 25 10:57:16 JST 2015
YUKI Hiroshi 2015-03-25 10:57:16 +0900 (Wed, 25 Mar 2015) New Revision: 38ad4fdb0f3a191ddfdd5bc82396485edf21326d https://github.com/droonga/droonga-engine/commit/38ad4fdb0f3a191ddfdd5bc82396485edf21326d Message: Refer default host/port/tag to NodeName, not Address. They are parts of NodeName. Modified files: lib/droonga/catalog_fetcher.rb lib/droonga/catalog_generator.rb lib/droonga/command/droonga_engine.rb Modified: lib/droonga/catalog_fetcher.rb (+3 -3) =================================================================== --- lib/droonga/catalog_fetcher.rb 2015-03-25 10:51:34 +0900 (6bf0694) +++ lib/droonga/catalog_fetcher.rb 2015-03-25 10:57:16 +0900 (d035235) @@ -17,7 +17,7 @@ require "socket" require "droonga/client" -require "droonga/address" +require "droonga/node_name" require "droonga/catalog/dataset" module Droonga @@ -41,8 +41,8 @@ module Droonga def default_options { :host => "127.0.0.1", - :port => Address::DEFAULT_PORT, - :tag => Address::DEFAULT_TAG, + :port => NodeName::DEFAULT_PORT, + :tag => NodeName::DEFAULT_TAG, :protocol => :droonga, :timeout => 1, :receiver_host => Socket.gethostname, Modified: lib/droonga/catalog_generator.rb (+4 -4) =================================================================== --- lib/droonga/catalog_generator.rb 2015-03-25 10:51:34 +0900 (2f8b97a) +++ lib/droonga/catalog_generator.rb 2015-03-25 10:57:16 +0900 (6edcf39) @@ -15,18 +15,18 @@ require "time" -require "droonga/address" +require "droonga/node_name" require "droonga/catalog/dataset" module Droonga class CatalogGenerator DEFAULT_DATASET = Catalog::Dataset::DEFAULT_NAME - DEFAULT_HOSTS = [Address::DEFAULT_HOST] + DEFAULT_HOSTS = [NodeName::DEFAULT_HOST] DEFAULT_N_WORKERS = 4 DEFAULT_N_SLICES = 1 DEFAULT_PLUGINS = ["groonga", "search", "crud", "dump", "system", "catalog"] - DEFAULT_PORT = Address::DEFAULT_PORT - DEFAULT_TAG = Address::DEFAULT_TAG + DEFAULT_PORT = NodeName::DEFAULT_PORT + DEFAULT_TAG = NodeName::DEFAULT_TAG attr_reader :datasets Modified: lib/droonga/command/droonga_engine.rb (+4 -4) =================================================================== --- lib/droonga/command/droonga_engine.rb 2015-03-25 10:51:34 +0900 (b7b2514) +++ lib/droonga/command/droonga_engine.rb 2015-03-25 10:57:16 +0900 (165499d) @@ -26,7 +26,7 @@ require "droonga/engine/version" require "droonga/loggable" require "droonga/deferrable" require "droonga/path" -require "droonga/address" +require "droonga/node_name" require "droonga/serf" require "droonga/node_metadata" require "droonga/file_observer" @@ -199,15 +199,15 @@ module Droonga private def default_host - Address::DEFAULT_HOST + NodeName::DEFAULT_HOST end def default_port - Address::DEFAULT_PORT + NodeName::DEFAULT_PORT end def default_tag - Address::DEFAULT_TAG + NodeName::DEFAULT_TAG end def default_log_level -------------- next part -------------- HTML����������������������������...Télécharger
