YUKI Hiroshi
null+****@clear*****
Fri Mar 27 17:19:20 JST 2015
YUKI Hiroshi 2015-03-27 17:19:20 +0900 (Fri, 27 Mar 2015) New Revision: c040ebf6ef810311f209462740eeaf0add59be9e https://github.com/droonga/droonga-engine/commit/c040ebf6ef810311f209462740eeaf0add59be9e Message: Revert "Synchronize data from updated node metadata dynamically" This reverts commit a4b51f8ee902e07dee314c9f967d09c0952cabdc. This is wrong way! Conflicts: lib/droonga/engine_node.rb Modified files: lib/droonga/engine.rb lib/droonga/engine_node.rb Modified: lib/droonga/engine.rb (+0 -1) =================================================================== --- lib/droonga/engine.rb 2015-03-27 17:19:00 +0900 (de27af7) +++ lib/droonga/engine.rb 2015-03-27 17:19:20 +0900 (9576219) @@ -26,7 +26,6 @@ require "droonga/catalog_loader" require "droonga/dispatcher" require "droonga/file_observer" require "droonga/node_metadata" -require "droonga/file_observer" module Droonga class Engine Modified: lib/droonga/engine_node.rb (+0 -7) =================================================================== --- lib/droonga/engine_node.rb 2015-03-27 17:19:00 +0900 (a4d85d4) +++ lib/droonga/engine_node.rb 2015-03-27 17:19:20 +0900 (ad1f35a) @@ -31,11 +31,6 @@ module Droonga @buffer = ForwardBuffer.new(name) - @node_metadata_observer = FileObserver.new(@loop, Path.node_metadata) - @node_metadata_observer.on_change = lambda do - @sender_node_metadata.reload - end - parsed_name = parse_node_name(@name) @sender = FluentMessageSender.new(loop, parsed_name[:host], @@ -48,13 +43,11 @@ module Droonga logger.trace("start: start") @sender.resume @buffer.start_forward if really_writable? - @node_metadata_observer.start logger.trace("start: done") end def shutdown logger.trace("shutdown: start") - @node_metadata_observer.stop @sender.shutdown logger.trace("shutdown: done") end -------------- next part -------------- HTML����������������������������...Download