YUKI Hiroshi
null+****@clear*****
Thu Jun 26 15:52:11 JST 2014
YUKI Hiroshi 2014-06-26 15:52:11 +0900 (Thu, 26 Jun 2014) New Revision: c2542a80374d9d549b799987b33eb72ca45c94a0 https://github.com/droonga/droonga-engine/commit/c2542a80374d9d549b799987b33eb72ca45c94a0 Message: Revert "Set cluster id as a serf tag" This reverts commit 464c89d06eace8c45b2924b09907275a421f0da7. Modified files: lib/droonga/engine.rb lib/droonga/engine_state.rb Modified: lib/droonga/engine.rb (+0 -4) =================================================================== --- lib/droonga/engine.rb 2014-06-26 15:52:09 +0900 (aea4753) +++ lib/droonga/engine.rb 2014-06-26 15:52:11 +0900 (ea4b875) @@ -33,10 +33,6 @@ module Droonga @state = EngineState.new(loop, name, internal_name) @catalog = load_catalog @state.catalog = @catalog - - serf = Serf.new(loop, name) - serf.set_tag("cluster_id", @state.cluster_id) - @dispatcher = create_dispatcher @nodes_status_observer = FileObserver.new(loop, Path.nodes_status) @nodes_status_observer.on_change = lambda do Modified: lib/droonga/engine_state.rb (+0 -9) =================================================================== --- lib/droonga/engine_state.rb 2014-06-26 15:52:09 +0900 (420add9) +++ lib/droonga/engine_state.rb 2014-06-26 15:52:11 +0900 (39d92ce) @@ -16,7 +16,6 @@ require "English" require "coolio" -require "digest/sha1" require "droonga/loggable" require "droonga/event_loop" @@ -117,10 +116,6 @@ module Droonga @nodes_status = new_status end - def cluster_id - @cluster_id ||= prepare_cluster_id - end - private def prepare_live_nodes @nodes_status.keys.select do |key| @@ -128,10 +123,6 @@ module Droonga end end - def prepare_cluster_id - Digest::SHA1.hexdigest(all_nodes.join("\n")) - end - def log_tag "engine_state" end -------------- next part -------------- HTML����������������������������...Download