YUKI Hiroshi
null+****@clear*****
Tue Mar 31 18:04:15 JST 2015
YUKI Hiroshi 2015-03-31 18:04:15 +0900 (Tue, 31 Mar 2015) New Revision: 664ba4a9154a1ebffeee784cb4ca190bffcff4f0 https://github.com/droonga/droonga-engine/commit/664ba4a9154a1ebffeee784cb4ca190bffcff4f0 Message: Don't apply new role and other metadata dynamically Modified files: lib/droonga/engine.rb lib/droonga/node_metadata.rb Modified: lib/droonga/engine.rb (+0 -2) =================================================================== --- lib/droonga/engine.rb 2015-03-31 17:36:05 +0900 (6234cb1) +++ lib/droonga/engine.rb 2015-03-31 18:04:15 +0900 (2a997b9) @@ -48,7 +48,6 @@ module Droonga def start logger.trace("start: start") - @node_metadata.start_observe(@loop) @state.on_ready = lambda do on_ready end @@ -63,7 +62,6 @@ module Droonga def stop_gracefully logger.trace("stop_gracefully: start") - @node_metadata.stop_observe @cluster.shutdown on_finish = lambda do logger.trace("stop_gracefully/on_finish: start") Modified: lib/droonga/node_metadata.rb (+4 -15) =================================================================== --- lib/droonga/node_metadata.rb 2015-03-31 17:36:05 +0900 (aa8ef7a) +++ lib/droonga/node_metadata.rb 2015-03-31 18:04:15 +0900 (0d8b612) @@ -57,6 +57,8 @@ module Droonga def set(key, value) logger.debug("setting: #{key}=#{value}") key = normalize_key(key) + # we must reload this to avoid losing of modifications made by other processes + reload @metadata[key] = value SafeFileWriter.write(metadata_file, JSON.pretty_generate(@metadata)) end @@ -64,6 +66,8 @@ module Droonga def delete(key) logger.debug("deleting: #{key}") key = normalize_key(key) + # we must reload this to avoid losing of modifications made by other processes + reload @metadata.delete(key) SafeFileWriter.write(metadata_file, JSON.pretty_generate(@metadata)) end @@ -80,21 +84,6 @@ module Droonga @metadata = load end - def start_observe(loop) - return if @file_observer - @file_observer = FileObserver.new(loop, metadata_file) - @file_observer.on_change = lambda do - reload - end - @file_observer.start - end - - def stop_observe - return unless @file_observer - @file_observer.stop - @file_observer = nil - end - private def normalize_key(key) key.to_sym -------------- next part -------------- HTML����������������������������...Download