YUKI Hiroshi
null+****@clear*****
Thu May 8 19:38:17 JST 2014
YUKI Hiroshi 2014-05-08 19:38:17 +0900 (Thu, 08 May 2014) New Revision: ed8d80bb11896714519c90670225c3f0ea55d4a5 https://github.com/droonga/droonga-engine/commit/ed8d80bb11896714519c90670225c3f0ea55d4a5 Message: Don't load live nodes list in catalog Modified files: lib/droonga/catalog/base.rb lib/droonga/catalog/version1.rb lib/droonga/catalog/version2.rb lib/droonga/catalog_loader.rb lib/droonga/catalog_observer.rb lib/droonga/engine.rb lib/droonga/engine/command/droonga_engine.rb Modified: lib/droonga/catalog/base.rb (+1 -2) =================================================================== --- lib/droonga/catalog/base.rb 2014-05-08 19:33:09 +0900 (a521b1c) +++ lib/droonga/catalog/base.rb 2014-05-08 19:38:17 +0900 (18e812f) @@ -24,10 +24,9 @@ module Droonga module Catalog class Base attr_reader :path, :base_path - def initialize(data, path, options={}) + def initialize(data, path) @data = data @path = path - @options = options @base_path = File.dirname(path) end Modified: lib/droonga/catalog/version1.rb (+1 -1) =================================================================== --- lib/droonga/catalog/version1.rb 2014-05-08 19:33:09 +0900 (fca5e36) +++ lib/droonga/catalog/version1.rb 2014-05-08 19:38:17 +0900 (3f51a4f) @@ -19,7 +19,7 @@ require "droonga/catalog/dataset" module Droonga module Catalog class Version1 < Base - def initialize(data, path, options={}) + def initialize(data, path) super @errors = [] Modified: lib/droonga/catalog/version2.rb (+1 -1) =================================================================== --- lib/droonga/catalog/version2.rb 2014-05-08 19:33:09 +0900 (76feeed) +++ lib/droonga/catalog/version2.rb 2014-05-08 19:38:17 +0900 (df9f8a6) @@ -20,7 +20,7 @@ require "droonga/catalog/version2_validator" module Droonga module Catalog class Version2 < Base - def initialize(data, path, options={}) + def initialize(data, path) super validate prepare_data Modified: lib/droonga/catalog_loader.rb (+2 -6) =================================================================== --- lib/droonga/catalog_loader.rb 2014-05-08 19:33:09 +0900 (45d82d2) +++ lib/droonga/catalog_loader.rb 2014-05-08 19:38:17 +0900 (f8c9416) @@ -20,9 +20,8 @@ require "droonga/catalog/version2" module Droonga class CatalogLoader - def initialize(path, options={}) + def initialize(path) @path = path - @options = options end def load @@ -46,10 +45,7 @@ module Droonga when 1 Catalog::Version1.new(data, @path) when 2 - catalog_options = { - :live_nodes_file => @options[:live_nodes_file], - } - Catalog::Version2.new(data, @path, catalog_options) + Catalog::Version2.new(data, @path) when nil raise Error.new("Catalog version must be specified in #{@path}") else Modified: lib/droonga/catalog_observer.rb (+2 -6) =================================================================== --- lib/droonga/catalog_observer.rb 2014-05-08 19:33:09 +0900 (29611dc) +++ lib/droonga/catalog_observer.rb 2014-05-08 19:38:17 +0900 (a768f02) @@ -28,10 +28,9 @@ module Droonga attr_reader :catalog attr_accessor :on_reload - def initialize(loop, options={}) + def initialize(loop) @loop = loop @catalog_path = catalog_path - @options = options load_catalog! end @@ -69,10 +68,7 @@ module Droonga end def load_catalog! - loader_options = { - :live_nodes_file => @options[:live_nodes_file], - } - loader = CatalogLoader.new(@catalog_path, loader_options) + loader = CatalogLoader.new(@catalog_path) @catalog = loader.load logger.info("loaded", :path => @catalog_path, :mtime => @catalog_mtime) ensure Modified: lib/droonga/engine.rb (+2 -5) =================================================================== --- lib/droonga/engine.rb 2014-05-08 19:33:09 +0900 (d491a66) +++ lib/droonga/engine.rb 2014-05-08 19:38:17 +0900 (9ebbee9) @@ -26,11 +26,8 @@ module Droonga include Loggable def initialize(loop, name) - @state = EngineState.new(loop, name, options={}) - observer_options = { - :live_nodes_list => options[:live_nodes_list], - } - observer = Droonga::CatalogObserver.new(@state.loop, observer_options) + @state = EngineState.new(loop, name) + observer = Droonga::CatalogObserver.new(@state.loop) @catalog_observer = observer @catalog_observer.on_reload = lambda do |catalog| graceful_restart(catalog) Modified: lib/droonga/engine/command/droonga_engine.rb (+2 -15) =================================================================== --- lib/droonga/engine/command/droonga_engine.rb 2014-05-08 19:33:09 +0900 (204d51f) +++ lib/droonga/engine/command/droonga_engine.rb 2014-05-08 19:38:17 +0900 (39e1d5e) @@ -36,12 +36,11 @@ module Droonga DEFAULT_HOST = Socket.gethostname DEFAULT_PORT = 10031 - attr_reader :host, :port, :tag, :live_nodes_file, :log_file, :pid_file + attr_reader :host, :port, :tag, :log_file, :pid_file def initialize @host = DEFAULT_HOST @port = DEFAULT_PORT @tag = "droonga" - @live_nodes_file = nil @log_file = nil @daemon = false @pid_file = nil @@ -71,11 +70,6 @@ module Droonga "--tag", @tag, "--log-level", log_level, ] - if live_nodes_file - command_line_options += [ - "--live-nodes-file", live_nodes_file.to_s, - ] - end command_line_options end @@ -104,10 +98,6 @@ module Droonga "(#{@tag})") do |tag| @tag = tag end - parser.on("--live-nodes-file=FILE", - "Path to the list file of live nodes") do |file| - @live_nodes_file = Pathname(file) - end end def add_log_options(parser) @@ -357,10 +347,7 @@ module Droonga end def run_engine - engine_options = { - :live_nodes_file => @configuration.live_nodes_file, - } - @engine = Engine.new(@loop, @configuration.engine_name, engine_options) + @engine = Engine.new(@loop, @configuration.engine_name) @engine.start end -------------- next part -------------- HTML����������������������������...Download